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

Conflict Resolution UI

From: Augie Fackler <durin42_at_gmail.com>
Date: 2007-08-30 22:24:12 CEST

Hey all,

The below is from a discussion with a fellow Adium developer (Peter
Hosey, cc'ed on this message) who is using svn 1.5's interactive
merging. He thinks (somewhat rightly, I suppose, given that svn's
choices were intuitive to me from my p4 experience) that we should
consider renaming the options in the merge resolution menu.

His proposed solution is below. I'm not entirely sure it's perfect,
but I think it might be less unclear than what we have now.


On Aug 30, 2007, at 4:08 PM, Peter Hosey wrote:

> On Aug 30, 2007, at 12:57:28, Augie Fackler wrote:
>> 'm' is "my" version of the file - whatever is in the working copy.
>> 't' is "their" version of the file - whatever is coming in from
>> the server.
>> Does that make sense?
> Only after a lot of thought. As I said, they're both in the WC and
> they're both in the repo.
> ---
> The command is:
> svn merge -r17251:20830 trunk branches/summer_of_code_2006/
> chirag_shah
> Being that I'm seemingly merging from one WC directory (./trunk) to
> another (./branches/...), I can't immediately find what server
> you're talking about.
> ---
> svn merge brings in the before and after versions from the server,
> so that must be it.
> ---
> Presumably you're talking about the after version of the file, not
> the before. I know an easy way to verify this—I'll look at the
> diff! (I did this earlier, too.)
> Select: (p)ostpone, (d)iff, (e)dit, (h)elp : d
> --- /tmp/tmp Thu Aug 30 13:02:31 2007
> +++ bar/.svn/tmp/tempfile.4.tmp Thu Aug 30 13:02:31 2007
> Uh... right.
> ---
> So let me see if I have this straight:
> “my” version is whatever is in the *destination*. In this case,
> it's branches/..., a WC directory, but svn merge does allow it to
> be an object in the repo (URL to URL atomic merge).
> “their” version is whatever is in the *source*. In this case, it's
> trunk, a WC directory.
> If this is correct, then this is how I recommend naming them and
> stating their purposes:
> (f)rom - clobber the destination object with the source object
> (t)o - ignore the source object; use the destination object
> unmodified
> f is what used to be t, and t is what used to be m.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 30 22:21:43 2007

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