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

Re: svn commit: r34326 - in branches/tc_url_rev/subversion: include include/private libsvn_client libsvn_wc svn

From: Neels J Hofmeyr <neels_at_elego.de>
Date: Sat, 22 Nov 2008 05:04:58 +0100

stsp_at_tigris.org wrote:
> Author: stsp
> Date: Fri Nov 21 15:45:55 2008
> New Revision: 34326
> Log:
> On the tc_url_rev branch:
> Resolve conflicts from merge with trunk.
> This commit is rather large for a 'resolve' commit, but catching
> up with progress made on trunk made quite a few changes neccessary.
> - svn_cmdline_printf(pool, _("Tree conflict: %s"), desc);
> + incoming_version =
> + svn_cl__node_description(info->tree_conflict->their_version, pool);
> + local_version =
> + svn_cl__node_description(info->tree_conflict->older_version, pool);
> +
> + svn_cmdline_printf(pool,
> + _("Tree conflict: %s\n"
> + " incoming version: %s\n"
> + " local version: %s"),
> + desc, incoming_version, local_version);
> }

Hey, this is wrong!
We're not printing the incoming and local version, but the older and their
"older version": the merge-left version
"their version": the merge-right version

"incoming version" makes no sense, "incoming changes" would make sense. I.e.
"diff older their". But we're not reporting that. We're reporting the older
version, the merge-left one.

"local version" is misleading. We're not reporting that here, it is printed
by "svn info" anyway, just further up. We're reporting "their version", the
merge-right one.

Changing it to "Older" and "Their". (r34329)

A "Your version" might seem to be missing... are we going to care about
that? I don't see a solution that is nice in every way. (repeat the info
printed above vs. print "Your version: see above").


Received on 2008-11-22 05:05:24 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.