[PATCH 3 of 6 V2] rebase: use scmutil.cleanupnodes (issue5606) (BC)

[Martin von Zweigbergk]

On Fri, Jul 7, 2017 at 7:11 PM, Jun Wu <quark at fb.com> wrote:
> diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
> --- a/tests/test-rebase-conflicts.t
> +++ b/tests/test-rebase-conflicts.t
> @@ -401,14 +401,19 @@ Test rebase with obsstore turned on and
>    not rebasing ignored 2:26805aba1e60 "C" (C)
>    rebasing 3:f585351a92f8 "D" (D)
> -  saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-cb2a9b47-backup.hg (glob)
> +  warning: orphaned descendants detected, not stripping 112478962961
> +  saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob)
>
>    $ rm .hg/localtags
>    $ hg tglog
> -  o  3:draft 'D'
> +  o  5:draft 'D'
> +  |
> +  o  4:draft 'B'
>    |
> -  o  2:draft 'B'
> +  @  3:draft 'E'
>    |
> -  @  1:draft 'E'
> -  |
> +  | o  2:draft 'C'
> +  | |
> +  | o  1:draft 'B'
> +  |/
>    o  0:draft 'A'
>

The line after reads "Note the above graph is wrong since C got
stripped incorrectly.". I'll remove that line in flight.