HI!
"Simon Large" <simon@skirridsystems.co.uk> wrote in message
news:4398A371.6060205@skirridsystems.co.uk...
> 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.
If TMerge would look at the diff between the files *-left* and *-right*, it
could see, what really should be merged.
> 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.
I'll try.
Thomas
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Dec 9 09:43:38 2005