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

Re: Presenting net code changes for a branch

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 23 Oct 2013 17:38:20 +0100 (BST)

Branko Čibej wrote:

> Well, I fail to see how "use mergeinfo" is in any way intuitive of
> the proposed semantics.

It shows the diff that would be merged from the branch to the trunk if we asked for a merge.

(Recall I did say this patch was just meant to promote discussion.  I too dislike this UI.)

> Instead of retrofitting this yet-another-catch-all option, we should
> just go and design branch naming instead; then we could have a
> magical kind of name that means "branch root". I dislike
> off-the-cuff solutions, as you well know.

Heh, yes.

> Another option -- somewhat less dependent on a completely new
> feature -- might be this:
>    svn diff -rROOT:HEAD

Well, you haven't ascribed a meaning to that syntax.  If you mean it should compare the "root of the branch" with the "tip" of the same branch, then no, that's not what we're looking for.  We're looking for (that diff) MINUS (whatever's been merged onto that branch from trunk).

- Julian

> Surely Subversion should be able to figure out when a branch was
> created.
Received on 2013-10-23 18:38:58 CEST

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.