svn merge --reintegrate results in a false text conflict set on a binary file

2009-12-27 Thread Pavel K.
Hello everybody, I have discovered a scenario when svn merge --reintegrate results in a false text conflict set on a binary file. The scenario is simple: 1. add any binary file to the trunk, 2. create a branch from the trunk, 3. modify the binary at the trunk, 4. merge changes from trunk to the

Re: Listing the commit messages for a single day

2009-12-27 Thread Ryan Schmidt
On Dec 27, 2009, at 13:46, Paulo J. Matos wrote: > I was trying to find a way to list the commit messages for a single > day in a repo. I found something using log but the result is > unexpected. I wanted to find the commit messages for today 27-12-2009, > so I did: > $ svn --non-interactive -r{20

Re: Listing the commit messages for a single day

2009-12-27 Thread Andy Levy
On Sun, Dec 27, 2009 at 14:46, Paulo J. Matos wrote: > Hi, > > I was trying to find a way to list the commit messages for a single > day in a repo. I found something using log but the result is > unexpected. I wanted to find the commit messages for today 27-12-2009, > so I did: > $ svn --non-inter

Listing the commit messages for a single day

2009-12-27 Thread Paulo J. Matos
Hi, I was trying to find a way to list the commit messages for a single day in a repo. I found something using log but the result is unexpected. I wanted to find the commit messages for today 27-12-2009, so I did: $ svn --non-interactive -r{2009-12-27}:{2009-12-28} log

Re: Problem with checkout on AMD64

2009-12-27 Thread Rob van Oostrum
On Sun, Dec 27, 2009 at 4:35 PM, Erik Huelsmann wrote: > On Sun, Dec 27, 2009 at 10:33 PM, Stefan Sperling wrote: > > On Sun, Dec 27, 2009 at 09:12:36PM +0100, Erik Huelsmann wrote: > >> There's a fundamental difference in how the svn client and TSVN > >> operate: TSVN creates all its files with

Re: Problem with checkout on AMD64

2009-12-27 Thread Erik Huelsmann
On Sun, Dec 27, 2009 at 10:33 PM, Stefan Sperling wrote: > On Sun, Dec 27, 2009 at 09:12:36PM +0100, Erik Huelsmann wrote: >> There's a fundamental difference in how the svn client and TSVN >> operate: TSVN creates all its files with full paths. In that case, the >> maximum length of a file name o

Re: Problem with checkout on AMD64

2009-12-27 Thread Stefan Sperling
On Sun, Dec 27, 2009 at 09:12:36PM +0100, Erik Huelsmann wrote: > There's a fundamental difference in how the svn client and TSVN > operate: TSVN creates all its files with full paths. In that case, the > maximum length of a file name on windows is 65k bytes. > > The way the SVN client does it is

Re: Problem with checkout on AMD64

2009-12-27 Thread Erik Huelsmann
On Sun, Dec 27, 2009 at 6:06 PM, Tim Ellison wrote: > On 24/Dec/2009 14:49, Stefan Sperling wrote: >> On Wed, Dec 23, 2009 at 01:31:36PM +, Tim Ellison wrote: >>> Hi, >>> >>> I'm trying to checkout Apache Harmony on an x86_64 machine using the SVN >>> command-line client 1.6.6 binaries downloa

Re: Problem with Subversion and TortoiseSVN

2009-12-27 Thread Jonas Arndt
I gave the client the URL i have found some others having similar problem: http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2416480 but it doesn't help. Anyway its a problem of my client - not of subversion - a friend of mine tested it. Greetings Jonas Am 27.12.2009

Re: Problem with Subversion and TortoiseSVN

2009-12-27 Thread Andrey Repin
Greetings, Jonas Arndt! > I have a problem, hope to find someone giving me the answer (and perhaps > a few slaps for the stupid mistake). I installed subversion on my server > and want using apache2 to connect from the world to the repo. i also > made an repo and if i take a browser like firefox -

Problem with Subversion and TortoiseSVN

2009-12-27 Thread Jonas Arndt
Hello folks, first of all: a merry christmas to all of you. I have a problem, hope to find someone giving me the answer (and perhaps a few slaps for the stupid mistake). I installed subversion on my server and want using apache2 to connect from the world to the repo. i also made an repo and if i t

Re: Problem with checkout on AMD64

2009-12-27 Thread Tim Ellison
On 24/Dec/2009 14:49, Stefan Sperling wrote: > On Wed, Dec 23, 2009 at 01:31:36PM +, Tim Ellison wrote: >> Hi, >> >> I'm trying to checkout Apache Harmony on an x86_64 machine using the SVN >> command-line client 1.6.6 binaries downloaded from CollabNet. >> >> I get the following error (below),