[PATCH 5 of 5] test: add isolated prune case (to test-obsolete-bundle-strip.t)

Martin von Zweigbergk martinvonz at google.com
Tue May 30 13:25:36 EDT 2017


On Fri, May 26, 2017 at 3:35 AM, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at octobus.net>
> # Date 1495733880 -7200
> #      Thu May 25 19:38:00 2017 +0200
> # Node ID 8cd41ed52b04ebdd3958f69d0c0fe463db20a597
> # Parent  94bae584c9d3695543d5885cabf41f89e0cd7e3f
> # EXP-Topic obsstrip
> # Available At https://www.mercurial-scm.org/repo/users/marmoute/mercurial/
> #              hg pull https://www.mercurial-scm.org/repo/users/marmoute/mercurial/ -r 8cd41ed52b04
> test: add isolated prune case (to test-obsolete-bundle-strip.t)

Thanks for adding all these tests!

>
> The add a test where the prune marker is not related to any other obsmarkers.
>
> diff --git a/tests/test-obsolete-bundle-strip.t b/tests/test-obsolete-bundle-strip.t
> --- a/tests/test-obsolete-bundle-strip.t
> +++ b/tests/test-obsolete-bundle-strip.t
> @@ -373,3 +373,41 @@ Actual testing
>    a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
>    b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
>    c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
> +
> +changeset pruned on its own
> +===========================
> +
> +. ⊗ B
> +. |
> +. ◕ A
> +. |
> +. ●
> +
> +setup
> +-----
> +
> +  $ mktestrepo lonely-prune
> +  $ hg up 'desc("ROOT")'
> +  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  $ mkcommit 'C-A'
> +  $ mkcommit 'C-B'
> +  $ hg debugobsolete --record-parent `getid 'desc("C-B")'`
> +
> +  $ hg up 'desc("ROOT")'
> +  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
> +  $ hg log --hidden -G
> +  x  cefb651fc2fd: C-B
> +  |
> +  o  9ac430e15fca: C-A
> +  |
> +  @  ea207398892e: ROOT
> +
> +  $ hg debugobsolete
> +  cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
> +
> +Actual testing
> +--------------
> +  $ hg debugobsolete --rev 'desc("C-A")'
> +  cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
> +  $ hg debugobsolete --hidden --rev 'desc("C-B")'

nit: This --hidden should not be necessary because you added it to the
[defaults], I think.

> +  cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list