[PATCH remotenames-ext] tests: re-order tags and bookmarks in tracking test
Martijn Pieters
mj at zopatista.com
Thu Sep 28 10:04:34 EDT 2017
Review handled on Phabricator, at https://phab.mercurial-scm.org/D830
On 27 September 2017 at 13:59, Martijn Pieters <mj at zopatista.com> wrote:
> # HG changeset patch
> # User Martijn Pieters <mjpieters at fb.com>
> # Date 1506517103 -3600
> # Wed Sep 27 13:58:23 2017 +0100
> # Node ID 64cc414eabb05a260f664682516c264cce04d02c
> # Parent 5289a6772ae59a8da42c75c508152997fcc1bb1a
> tests: re-order tags and bookmarks in tracking test
>
> Core hg rev 4f969b9e (https://phab.mercurial-scm.org/D741) altered the
> output order.
>
> diff --git a/tests/test-tracking.t b/tests/test-tracking.t
> --- a/tests/test-tracking.t
> +++ b/tests/test-tracking.t
> @@ -47,14 +47,14 @@
> a 1:fdceb0e57656
> * b 2:dea4e1d2ca0e [a: 1 ahead, 1
> behind]
> $ hg rebase --tool :fail
> - rebasing 2:dea4e1d2ca0e "b" (tip b)
> + rebasing 2:dea4e1d2ca0e "b" (b tip)
> unresolved conflicts (see hg resolve, then hg rebase --continue)
> [1]
> $ echo aa > a
> $ hg resolve --mark a 2>&1 | grep -v "^continue:"
> (no more unresolved files)
> $ hg rebase --continue
> - rebasing 2:dea4e1d2ca0e "b" (tip b)
> + rebasing 2:dea4e1d2ca0e "b" (b tip)
> saved backup bundle to $TESTTMP/repo1/.hg/strip-
> backup/dea4e1d2ca0e-a7f1cee1-*.hg (glob)
> $ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}'
> @ 2 b b
> @@ -229,7 +229,7 @@
> $ hg bookmarks -v
> * c 5:ff58066d17c3 [remote/a: 1
> ahead, 2 behind]
> $ hg rebase
> - rebasing 5:ff58066d17c3 "d" (tip c)
> + rebasing 5:ff58066d17c3 "d" (c tip)
> saved backup bundle to $TESTTMP/repo2/.hg/strip-
> backup/ff58066d17c3-470dd0be-*.hg (glob)
> $ hg log -G -T '{rev} {node|short} {bookmarks} {remotebookmarks}\n'
> @ 5 8d13dc14fef1 c
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
--
Martijn Pieters
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20170928/e71ededa/attachment.html>
More information about the Mercurial-devel
mailing list