[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 23:38:28 CEST

"SteveKing" wrote
> >>>When I try to resolve a conflicted update using TME, the panes show
> >>>"Yours - /mergedname:"
> >>>I think the Yours pane has an error in the title ;-)
> Just an idea:
> check your settings for the external merge tool in the settings dialog.
> Maybe there's something wrong there? If you're not sure, just empty the
> edit box, the default is always TortoiseMerge.

Sorry, nothing there. Both Diff and Merge are set to builtin, nothing in the
external box, and nothing in advanced.

I can repeat this very easily.
Check out into 2 dirs A & B.
Edit same line in a file in A & B.
Commit A
Update B
Double click on the 'conflicted C:\Temp\Test4a\Test.c' line
It also happens if I right-click on the file directly and select Edit
Maybe it is only a problem in build 1618.

And another thing (oh no, not *another* other thing ... )
If I try to commit the directory, there is no clear indication that there
are still conflicts. There is a big clue in that I get Test.c.mine,
Test.c.r5 and Test.c.r6 showing up in the unversioned files, but if the
ignore list is not set up so there are a lot of other unversioned files you
might miss it. My directory is only 1 level deep so I can see the conflict
overlay easily, but in a deep folder structure I would not. I don't know if
it is easy for the commit dialog to detect that.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 11 20:13:21 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.