--- a/tests/test-metaedit.t Mon Dec 11 16:12:38 2017 +0100
+++ b/tests/test-metaedit.t Mon Dec 11 16:32:03 2017 +0100
@@ -80,11 +80,11 @@
----
$ hg log -G
- @ 7 : F - test
+ @ 8 : F - test
|
- o 6 : E - test
+ o 7 : E - test
|
- | o 5 : D2 - test
+ | o 6 : D2 - test
|/
o 3 : C - test
|
@@ -124,10 +124,13 @@
$ hg metaedit --user foobar
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log --template '{rev}: {author}\n' -r 'desc(F):' --hidden
+ 5: test
+ 6: test
7: test
- 8: foobar
+ 8: test
+ 9: foobar
$ hg log --template '{rev}: {author}\n' -r .
- 8: foobar
+ 9: foobar
TODO: support this
$ hg metaedit '.^::.'
@@ -136,15 +139,17 @@
$ HGEDITOR=cat hg metaedit '.^::.' --fold --note 'folding changesets using metaedit,
> and newlines'
+ current hg version does not support storing note in obsmarker
abort: note cannot contain a newline
[255]
$ HGEDITOR=cat hg metaedit '.^::.' --fold --note "folding changesets using metaedit"
+ current hg version does not support storing note in obsmarker
HG: This is a fold of 2 changesets.
- HG: Commit message of changeset 6.
+ HG: Commit message of changeset 7.
E
- HG: Commit message of changeset 8.
+ HG: Commit message of changeset 9.
F
@@ -161,22 +166,22 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ glog -r .
- @ 9:a08d35fd7d9d@default(draft) E
+ @ 10:a08d35fd7d9d@default(draft) E
|
~
$ hg obslog -r .
- @ a08d35fd7d9d (9) E
+ @ a08d35fd7d9d (10) E
|\
- x | 212b2a2b87cd (8) F
+ x | 212b2a2b87cd (9) F
| | rewritten(description, user, parent, content) as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000)
| | note: folding changesets using metaedit
| |
- | x c2bd843aa246 (6) E
+ | x c2bd843aa246 (7) E
| rewritten(description, content) as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000)
| note: folding changesets using metaedit
|
- x 587528abfffe (7) F
+ x 587528abfffe (8) F
rewritten(user) as 212b2a2b87cd by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -198,7 +203,7 @@
nothing changed
$ glog -r '.^::.'
- @ 9:a08d35fd7d9d@default(draft) E
+ @ 10:a08d35fd7d9d@default(draft) E
|
o 3:3260958f1169@default(draft) C
|
@@ -212,20 +217,20 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n'
3: C
- 10: E
+ 11: E
$ hg up .^
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg metaedit --user foobar2 tip
$ hg log --template '{rev}: {author}\n' -r "user(foobar):" --hidden
- 8: foobar
- 9: test
+ 9: foobar
10: test
- 11: foobar2
+ 11: test
+ 12: foobar2
$ hg diff -r "10" -r "11" --hidden
'fold' one commit
$ HGUSER=foobar3 hg metaedit "desc(D2)" --fold -U
1 changesets folded
$ hg log -r "tip" --template '{rev}: {author}\n'
- 12: foobar3
+ 13: foobar3