[PATCH] rebase: do not add second parent to rebased changeset (drop detach option) (BC)

[Pierre-Yves David]

On Thu, Jun 07, 2012 at 01:58:22PM +0200, pierre-yves.david at logilab.fr wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1339069890 -7200
> # Node ID 146a5994a0dbe3f6dd5dcb05bacfdff6f92a8c97
> # Parent  2255950e1f7663a9faa6b57040cc5c0debe7d4dd
> rebase: do not add second parent to rebased changeset (drop detach option) (BC)
> 
> Rebase now always keeps the number of parents constant. merge are rebased as
> merge and non-merge are rebased with single parent. This mean that hg rebase
> always "detach" the rebase set from it's original branch if the root changeset
> only have a single parent.
> 
> This only alter the behavior of rebase when using the --source option. The
> detach option itself is dropped.
> 
> See in comment in code for details on the Why and How of the new behavior.
> 
> All test changes have been manually validated with care.

Gentle ping of this patch which will prevent further user confusion. Lastest
confusion: http://bz.selenic.com/show_bug.cgi?id=3504

-- 
Pierre-Yves David

http://www.logilab.fr/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120619/87c6ee88/attachment.pgp>