pbranch: can you easily consolidate (all) pbranches into one?
Peter Arrenbrecht
peter.arrenbrecht at gmail.com
Sun Feb 7 09:37:49 UTC 2010
On Sat, Feb 6, 2010 at 12:17 PM, Hans-Peter Oeri <hp at oeri.ch> wrote:
> Hi!
>
> Peter Arrenbrecht wrote:
>> Here, "rel" is what I figure you mean by your "FullPatch". So the
>> latter should be a pbranch-level octopus merge of all your separate
>> feature patches.
>>
> After some experimenting, I got it... Octopus is even more 'stylish'
> than what I intended ;)
>
> Thanks a lot for that pointer!
>
> Just a little suggestion for enhancing octopus-pmerge (given the
> examples on your octopus.htm page): Instead of merging .O into O with a
> message 'merge of .O', it would probably be more 'octopus-like' to let
> the message indicate the different pbranches: 'merge of A, B, C, D & E'
> (the pbranches with actual changes). '.O' is just a technical aid, after
> all (if I understood correctly).
I like this.
http://bitbucket.org/parren/hg-pbranch/issue/51/improve-changelog-message-for-octopus
> Or else, an option to directly merge
> into O (5 merges with individual messages in the example, no rerouting
> through .O) is probably easier.
-parren
More information about the Mercurial
mailing list