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

[TSVN] Re: TortoiseMerge bug & feature request

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-09-03 18:23:22 CEST

"SteveKing" wrote
> Simon Large wrote:
> > When I try to resolve a conflicted update using TME, the panes show
> > 'Theirs - tsvn_ch04.xml.r1638"
> > "Yours - /mergedname:"
> > "Merged - tsvn_ch04.xml"
> >
> > I think the Yours pane has an error in the title ;-)
> How did you do that???
> I can't see (from looking at the code) how this could happen - really!
> Can you give me more information please?
> Versions, how was TME started, filepaths involved, ...

Build 1618 - I really should update to the next build.
I edited the file, sent the patch to Luebbe who put in some of his own
changes as well. When I did an update on my 'Doc' folder I got a conflict on
that file (no surprise there), so I double clicked on the 'Conflicted:
tsvn_ch04.xml' line in the update dialog and got TME with these window

> > It is not clear which of the 3 stripes on the left refers to which
> > Can you have a hint popup to clarify?
> I think that's not necessary. And I think a popup wouldn't help much.
> And it's really simple:

OK. I will make a patch for the TME doc.

> > After resolving conflicts, there appears to be a lot of red remaining in
> > stripes on the left. Do they get updated after conflict resolution?
> They get updated when you restart TME. The colors don't really change
> when you resolve a conflict.

Well the colours do change in the 'merged' window - the red disappears after
resolving. But if there is a Prev/Next Conflict button I can find out if I
missed anything... when you have spare time ;-)


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 3 19:26:57 2004

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.