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

Martin von Zweigbergk martinvonz at google.com
Wed Jul 5 23:27:25 UTC 2017


On Mon, Jun 26, 2017 at 3:35 PM, Jun Wu <quark at fb.com> wrote:
> # HG changeset patch
> # User Jun Wu <quark at fb.com>
> # Date 1498508807 25200
> #      Mon Jun 26 13:26:47 2017 -0700
> # Node ID 7a7f6844fe0b0e0545510ea4a73b00432029a12c
> # Parent  845ce766fcf0bc75a5bfff22cf5a121ad6777c05
> # Available At https://bitbucket.org/quark-zju/hg-draft
> #              hg pull https://bitbucket.org/quark-zju/hg-draft -r 7a7f6844fe0b
> rebase: use scmutil.cleanupnodes (issue5606) (BC)
>
> 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
> @@ -88,5 +88,5 @@ Conclude rebase:
>    rebasing 4:46f0b057b5c0 "L2"
>    rebasing 5:8029388f38dc "L3" (mybook)
> -  saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg (glob)
>
>    $ hg tglog
> @@ -269,6 +269,4 @@ Check that the right ancestors is used w
>    rebased as 2a7f09cac94c
>    rebase merging completed
> -  rebase status stored
> -  updating the branch cache
>    update back to initial working directory parent
>    resolving manifests
> @@ -279,4 +277,6 @@ Check that the right ancestors is used w
>     f2.txt: remote created -> g
>    getting f2.txt
> +  rebase completed
> +  updating the branch cache
>    2 changesets found
>    list of changesets:

The reason for the two hunks above is not clear to me. Could you explain?


More information about the Mercurial-devel mailing list