D341: test-rebase-obsolete: add "\n" in template
quark (Jun Wu)
phabricator at mercurial-scm.org
Fri Aug 11 05:41:42 UTC 2017
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This makes the test a bit cleaner since `log --stat` does not need to
specify `-T` manually to keep its output readable.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D341
AFFECTED FILES
tests/test-rebase-obsolete.t
CHANGE DETAILS
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -6,7 +6,7 @@
$ cat >> $HGRCPATH << EOF
> [ui]
- > logtemplate= {rev}:{node|short} {desc|firstline}
+ > logtemplate= {rev}:{node|short} {desc|firstline}\n
> [experimental]
> evolution=createmarkers,allowunstable
> [phases]
@@ -420,7 +420,7 @@
---------------------------------------------------------------------
$ hg log -r 'children(8)'
- 9:cf44d2f5a9f4 D (no-eol)
+ 9:cf44d2f5a9f4 D
$ hg rebase -r 8
rebasing 8:e273c5e7d2d2 "C"
$ hg log -G
@@ -1139,7 +1139,7 @@
note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 3:058c1e1fb10a "D"
rebasing 4:d6e82823588a "E" (E)
warning: cannot decide a unique merge base for 4:d6e82823588a, merge result may be suboptimal
- $ hg log -Gp -T '{rev}:{node|short} {desc|firstline}\n'
+ $ hg log -Gp
o 6:d0827eab33f0 E
| diff -r e0c929a964ce -r d0827eab33f0 A
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1214,17 +1214,17 @@
$ hg rebase -r 2 -d 1
rebasing 2:1e9a3c00cbe9 "b" (tip)
$ hg log -r . # working dir is at rev 3 (successor of 2)
- 3:be1832deae9a b (no-eol)
+ 3:be1832deae9a b
$ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now
$ hg up 2 && hg log -r . # working dir is at rev 2 again
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- 2:1e9a3c00cbe9 b (no-eol)
+ 2:1e9a3c00cbe9 b
$ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1
note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b"
Check that working directory was updated to rev 3 although rev 2 was skipped
during the rebase operation
$ hg log -r .
- 3:be1832deae9a b (no-eol)
+ 3:be1832deae9a b
Check that bookmark was not moved to rev 3 if rev 2 was skipped during the
rebase operation. This makes sense because if rev 2 has a successor, the
To: quark, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list