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

Strange merge conflicts...

From: Erik Wasser <erik.wasser_at_iquer.net>
Date: 2005-07-28 18:34:21 CEST

Hello list,

I've a problem a strange merging conflict here:

My src main trunk is under svn+ssh://ganzfix/raid/svn/all/src and my
patches are within 'svn+ssh://ganzfix/raid/svn/all/patches/$PATCHNAME'.

I'm doing a fine patch history in a text file looking like this:

-> 936 Created with the 936 version

The '->' means that I've transported something from the main trunk to a
patch trunk (and vice versa).

<- 936:940 Applied patches to the main trunk.
   svn -r 936:940 merge
svn+ssh://ganzfix/raid/svn/all/patches/postvrelay/. .

-> 936:1194 Normal patches from the main trunk applied
svn -r 936:1194 merge svn+ssh://ganzfix/raid/svn/all/src/. .

-> 1195:1196 Normal patches from the main trunk applied
svn -r 1195:1196 merge svn+ssh://ganzfix/raid/svn/all/src/. .

This was the last command:

<- 941:1197 Applied patches to the main trunk.
svn -r 941:1197 merge
svn+ssh://ganzfix/raid/svn/all/patches/postvrelay/. .

Assuming that I'm always in the correct directory when I write '.' the
following problem occured:

% ls -al www/doc/incomings.dia*
[...ommiting some colums from ls for a better readability...]
 1361 Jun 22 15:01 www/doc/incomings.dia
    0 Jul 28 16:40 www/doc/incomings.dia.merge-left.r0
 1361 Jul 28 16:40 www/doc/incomings.dia.merge-right.r1197
%

I don't believe that there was ever a 0 byte version of 'incomings.dia'
in my repository:

a) I checked the first version of the file: it was 1361 bytes with the
first checkin (md5sum is equal too).

b) the file belongs to 'dia' that is using XML format for writing
diagrams to disc and a 0 byte XML file is quite unusal. Other involved
files a png or jpg. No program writes 0 byte files of this file
formats.

So I believe there was never a 0 byte of this file so why is there a
conflict here?

I got the same problem here with nearly all (in this case: 7) binary
files : left version is 0 bytes and the rights version is the full-size
version. And this is not the first times this happens to me. B-(

Should I post more informationen? Is this normal? Is it me or svn? B-)

I'm using 'svn, version 1.1.3 (r12730), compiled Mar 16 2005,
12:35:13' (both server and client are gentoo computers)

P.S: I'm sorry for the post on 'svn@subversion.tigris.org'. It was just
a mistake. B-(

-- 
So long... Fuzz
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 28 18:36:18 2005

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