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

Re: [TSVN] Resolving Conflicts

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-07-24 09:52:59 CEST

Will Gayther wrote:

> Oh - I'm doing a commit without doing an update. If I
> do the update first then things work out the way they
> are supposed to. Although if WinMerge won't work with
> TortoiseCVS, then I suppose I'll have to try to hunt
> down another merge tool that will.

I didn't say that it won't work with TSVN. It does, and a lot of people
use it with TSVN. All I'm saying is that it can't do three way diffs and
therefore isn't very well suited for resolving conflicts. But if you
still want to use it, just go ahead!

> I'm not using TortoiseMerge because
> 1. it won't let me actually edit the "resolved" file.
> I have to choose which line I want to use. But often I
> don't want either line anymore. With the other files
> changes, sometimes I want to type in a new line myself
> or merge info from both lines.

Maybe TortoiseMerge will be able to do that someday...

> 2. I'm trying to convice the other member of our
> project to use Subversion rather than Visual
> Sourcesafe (yeah, I know). But I know that as soon as
> I show them the psychedelic colors in the

psychedelic colors? Hard words - and if you check the WinDiff program
which comes with the windows SDK you will see that it uses the same
colors (in TortoiseMerge one-pane-view). And the colors in two and three
pane view are the same as P4Diff and P4Merge uses.
Also, you can change the colors in the settings dialog.

> TortoiseMerge editor, I'm going to lose the ones who
> chose Visual Sourcesafe because it had a "nice gui".

> A suggestion - when I try to "commit" a conflicted
> repository, the commit fails with an obscure error
> message. Perhaps Tortoise CVS could replace/add to the
> originl message:
> Commit Failed (details follow):
> Out of date: 'Test2.c' in transaction '1k'
> with a message that says
> "Commit failed because you need to run an update then
> resolve all conflicts (the file with the yellow and
> red "!" sign on them) before commiting" then list off
> the conflicted files. What do you think?

I'm currently working on that - see my mails with subject "TODO list for
1.1.0" on this list.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Jul 24 11:01:49 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.