transplant's --merge flag, was: Re: Combining history of two branches

[Martin Geisler]

Nicolas Schier <schier at shf.de> writes:

> Transplanting a changeset using the --merge flag changes the 'hg glog'
> output from:
>
>    ~/test# hg glog
>    @  changeset:   2:aff985fa61bf
>    |  tag:         tip
>    |  parent:      0:1e240dde6ff8
>    |  user:        Nicolas Schier <schier at shf.de>
>    |  date:        Do Mai 07 07:40:53 2009 +0200
>    |  summary:     created file3
>    |
>    | o  changeset:   1:96716f9bac14
>    |/   user:        Nicolas Schier <schier at shf.de>
>    |    date:        Do Mai 07 07:40:29 2009 +0200
>    |    summary:     created file2
>    |
>    o  changeset:   0:1e240dde6ff8
>       user:        Nicolas Schier <schier at shf.de>
>       date:        Do Mai 07 07:40:04 2009 +0200
>       summary:     created file
>
> to:
>
>    ~/test# hg transplant --merge 1
>    applying 96716f9bac14
>    1:96716f9bac14 merged at 672d6c818d9a
>    ~/test# hg glog
>    @    changeset:   3:672d6c818d9a
>    |\   tag:         tip
>    | |  parent:      2:aff985fa61bf
>    | |  parent:      1:96716f9bac14
>    | |  user:        Nicolas Schier <schier at shf.de>
>    | |  date:        Do Mai 07 07:40:29 2009 +0200
>    | |  summary:     created file2
>    | |
>    | o  changeset:   2:aff985fa61bf
>    | |  parent:      0:1e240dde6ff8
>    | |  user:        Nicolas Schier <schier at shf.de>
>    | |  date:        Do Mai 07 07:40:53 2009 +0200
>    | |  summary:     created file3
>    | |
>    o |  changeset:   1:96716f9bac14
>    |/   user:        Nicolas Schier <schier at shf.de>
>    |    date:        Do Mai 07 07:40:29 2009 +0200
>    |    summary:     created file2
>    |
>    o  changeset:   0:1e240dde6ff8
>       user:        Nicolas Schier <schier at shf.de>
>       date:        Do Mai 07 07:40:04 2009 +0200
>       summary:     created file
>
> You can see where your transplanted changeset came from. I think that
> is the main point of the --merge flag.

Aha... thanks for the explaination, now I see what it does. But I wont
claim to see why I would like it to do that :-)

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial/attachments/20090507/bf257e5b/attachment.pgp