[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: Will Gayther <subversion_at_jweblog.com>
Date: 2004-07-24 01:44:06 CEST

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

--- SteveKing <steveking@gmx.ch> wrote:
> Will Gayther wrote:

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Jul 24 10:41:48 2004

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