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

Re: Merge problem (with repro)

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-12-08 22:19:45 CET

Thomas Börkel wrote:
> HI!
> Lately we encounter a particular merge problem pretty often. Maybe this is a
> new problem in the latest Tortoise or Subversion versions.
[snip repro]
> Of course, this leads to a conflict. But you cannot see in TortoiseMerge,
> that only the A, B, C, D, E lines are new. It looks as if also the 6, 7, 8,
> 9, 0 lines are from this merged diff. So, you cannot decide without looking
> at the real diff, which lines you should use to resolve the conflict.

I am not sure about this one. I can see what you mean in TMerge, but
looking at the working files produced by Subversion it's not clear what
TMerge could do better.

Is this a new problem? Could you try with an older version of the CLI
and see if the handling in subversion itself has changed. I think this
may be one for the subversion list.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Dec 8 22:24:03 2005

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

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