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

[TSVN] TortoiseMerge bug & feature request

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-09-03 15:57:27 CEST

When I try to resolve a conflicted update using TME, the panes show
'Theirs - tsvn_cho4.xml.r1638"
"Yours - /mergedname:"
"Merged - tsvn_ch04.xml"

I think the Yours pane has an error in the title ;-)

It is not clear which of the 3 stripes on the left refers to which window.
Can you have a hint popup to clarify?

After resolving conflicts, there appears to be a lot of red remaining in the
stripes on the left. Do they get updated after conflict resolution?

Feature request. Is it possible to have a "Next Conflict"/"Prev Conflict"
pair, working in the same way as "Next Diff"/"Prev Diff"?

There is an option in TME to resolve conflicted status on save. Does this
check that all conflicts have actually been resolved before doing the SVN
resolve bit?


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 3 17:06:50 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.