On Mon, Sep 12, 2011 at 10:37 AM, Mark Phippard <markphip_at_gmail.com> wrote:
> I have a working copy of trunk and I do the merge shown as r14 (which
> is what will be created when I commit this merge). Here is the
> command I run and the diff output of the mergeinfo:
> $ svn merge ^/branches/b .
> --- Merging r10 through r13 into '.':
> A products/roadmap.html
> U products/index.html
> U about/index.html
> U index.html
> U news/index.html
> U .
> --- Recording mergeinfo for merge of r10 through r13 into '.':
> G .
> $ svn diff
> Index: .
> --- . (revision 13)
> +++ . (working copy)
> Property changes on: .
> Modified: svn:mergeinfo
> Merged /branches/a:r6,8-11
> Merged /branches/b:r10-13
> This gives a simple example to talk about. What changes would you
> propose making to this output?
Our emails cross paths. I think this is the output you propose:
Property changes on: .
Changes merged to '.':
If this is the entire scope of your proposal, then I have no
objections. I thought you were proposing that you wanted to show that
/b was merged and then either now show /a at all or somehow
distinguish that it came with the changes merged from /b. I would not
object to doing that either, I just do not know how you could.
Received on 2011-09-12 16:48:40 CEST