[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Fwd: Merge BUG in Windows]

From: Pedro Beck Gomes da Costa <pbeck_at_ciberbit.pt>
Date: 2003-11-11 12:34:39 CET

Hi, Thanks for your contact.
As I said in the original message, If I create a test repository with
this structure:


Changing the file on branch A and issuing this command to merge with
trunk (inside the trunk working copy):

svn merge -r 3:HEAD file:///SVN_REPOS/Projecto/branches/A

gives me:

C Novo Documento de texto.txt
svn: End of file found
svn: Failed to read file 'EncomendasLojas.dfm.tmp'.

The merge fails and I get the following files on the dir (workin copy of
the trunk):

08-09-2003 14:08 134.221 EncomendasLojas.dfm
11-11-2003 11:18 0 EncomendasLojas.dfm.2.tmp
11-11-2003 11:18 134.221 EncomendasLojas.dfm.tmp
11-11-2003 11:18 134.273 EncomendasLojas.dfm.tmp.2.tmp
11-11-2003 11:18 0 EncomendasLojas.dfm.tmp.tmp

I'm using Windows XP Professional with SubVersion 0.32.1. I tried the
same with TortoiseSVN 0.21 (that uses the same SVN version) with same
The exact same thing works fine when I try it on my Linux box (Slackware
9.0 with svn0.32.1 compiled from sources) and on my FreeBSD Box (FreeBSD
4.8 with svn0.32.1 compiled from the svn port), so it must be some
problem with the windows version.

If you need something more just contact me!
Thanks again,

Pedro Costa

kfogel@collab.net wrote:

>Pedro Beck Gomes da Costa <pbeck@ciberbit.pt> writes:
>>I send the file in attachement. If I create a new Repository with only
>>this file and checkout it and then create a branch and then change the
>>file in the branche, when i try to merge it with the trunk i get the
>What's the exact command line you use for the merge, and what is all
>the output?

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 11 12:35:28 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.