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

.working file not as expected when merging

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 23 Jul 2009 18:36:35 +0200

Hi,

A user reported on the TSVN mailing list a problem when resolving
conflicts after a merge.
I could reproduce the problem, and I think this is a bug in the svn library:

According to the docs (as I understand it), the 'filename.working' file
should be "your file as it existed in your working copy before you
updated your working copy—that is, without conflict markers". But a
simple diff of the 'filename.working' file with the 'filename' file
shows a lot more differences than just the parts with the conflict
markers (even though the file had no local modifications prior to the
merge).

To reproduce this:

$ svn co http://svn.orxonox.net/orxonox/trunk -r3316
$ cd trunk
$ svn merge http://svn.orxonox.net/orxonox/branches/core4 . -c 3270 -r
3271:3276 -c 3279 -c 3281 -r 3284:3286 -c 3288 -r 3289:3295 -c 3306 -r
3309:3311

Now compare the files
src/core/input/InputManager.cc and src/core/input/InputManager.cc.working

I *think* the InputManager.cc.working file is wrong and should not
differ that much from InputManager.cc.

Or is the documentation wrong? Or did I misread/misunderstand the docs?

The problem I have with the .working file in TSVN is that TSVN uses the
.left, .right and .working files to resolve the conflict, not the
'original' file with the conflict markers. And with the .working file in
that state, the conflict resolving leads to a messed up result.

The mail thread of the original report is here:
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2372432

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2374897
Received on 2009-07-23 18:37:13 CEST

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