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

RE: Suggestion(or bug?) Updating and Conflicted files...

From: Peter Yamamoto <yamamotop_at_page44.com>
Date: 2006-07-24 20:32:58 CEST

Also the difference in options/behavior in different dialogs seems
non-intuitive.

I don't have time right now to go through and give examples, but figured
that maybe it's by design anyway and this is known, but thought that
this is the time to mention it (in case it wasn't, or wasn't viewed as
non-intuitive).

One example, I guess is, and maybe this can be considered user error,
but if you edit conflicts, say using araxis merge as your 3way merge,
then do a save as replacing your local version, note that after exiting,
there is no querying/change in what subversion thinks about the status.
So if you say resolve using "mine" (thinking that it's the local version
you just updated), then you are wrong, and you will overwrite your
merged file with the state before the merge. Again, maybe this makes
sense "explicitly", but I'm not so sure it makes sense "intuitively".

Peter

-----Original Message-----
From: Rob.Conde [mailto:Rob.Conde@ai-solutions.com]
Sent: Monday, July 24, 2006 11:00 AM
To: users@tortoisesvn.tigris.org
Subject: Suggestion(or bug?) Updating and Conflicted files...

Hey Guys,
        It's very cool that when updating you can right click on the
conflicted files and resolve them right there...unfortunately when you
then right click the file and change it to resolved, it fails to update
the display even though the file does in fact change to resolved. This
makes it difficult to keep track of which files we've already merged.
I'm not sure if this is intentional, a bug, or an oversight. In any
case, it would be great if the display did update.

Robert Conde

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Jul 24 20:33:06 2006

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