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

Re: [TSVN] TortoiseMerge bug & feature request

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-09-03 16:45:00 CEST

Simon Large wrote:
> 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 ;-)

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, ...

> It is not clear which of the 3 stripes on the left refers to which window.
> 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:
left = left view
middle = bottom view
right = right view

> 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?

They get updated when you restart TME. The colors don't really change
when you resolve a conflict.

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

It's possible. But right now I'm working on something else...

> 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?

The "resolve conflicts on save" is to do a "svn resolved" after saving
the file. But before you can save a file, TME checks if there are still
conflicts in the file and gives you a warning if there are.


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:46:52 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.