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

[Patrick Mézard]

Le 20/06/12 20:21, Pierre-Yves David a écrit :
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1340215737 -7200
> # Node ID e9a4e50ca478d4cec5ea52036507cdf497e9c643
> # Parent  132ea1736751cb02b16992cf421e7de8bad888a1
> rebase: do not add second parent to rebased changeset (drop detach option) (BC)
> 
> Rebase now behaves as if --detach was always passed. Non-merges are
> rebased as non-merges, regardless of their parent being an ancestor of
> the destination. Merges will usually be rebased as merges unless both of
> their parents are ancestors of the destination, or one of their parents
> is pruned when rebased.
> 
> This only alters the behavior of rebase when using the --source/--rev
> options. --detach option is deprecated.
> 
> All test changes were carefully validated.

+1

--
Patrick Mézard