##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

command line templates: add formatnode filter...
command line templates: add formatnode filter This will print a full hash node with --debug and a short one otherwise. Use it with some default templates and in map-cmdline.default to print the parents. This should fix issue538.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r4195:e8ee8fde default
r4352:051fb8c2 default
Show More
test-backout.out
51 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-backout.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
add backout command....
 r2158 # basic operation
adding a
Vadim Gelfer
revert: better fix for not printing 'reverting' message
 r2407 reverting a
Thomas Arendsen Hein
Corrected tests for commit now consistently stripping last newline.
 r2303 changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57
Vadim Gelfer
add backout command....
 r2158 a
# file that was removed is recreated
adding a
adding a
Thomas Arendsen Hein
Corrected tests for commit now consistently stripping last newline.
 r2303 changeset 2:44cd84c7349a backs out changeset 1:76862dcce372
Vadim Gelfer
add backout command....
 r2158 content
# backout of backout is as if nothing happened
removing a
Thomas Arendsen Hein
Corrected tests for commit now consistently stripping last newline.
 r2303 changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a
Vadim Gelfer
add backout command....
 r2158 cat: a: No such file or directory
# backout with merge
adding a
Vadim Gelfer
revert: better fix for not printing 'reverting' message
 r2407 reverting a
Thomas Arendsen Hein
Corrected tests for commit now consistently stripping last newline.
 r2303 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23
Vadim Gelfer
add backout command....
 r2158 merging with changeset 2:b66ea5b77abb
merging a
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Vadim Gelfer
add backout command....
 r2158 line 1
Brendan Cully
Test case for #295
 r2492 # backout should not back out subsequent changesets
adding a
adding b
reverting a
changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5
Vadim Gelfer
print message after backout that tells that backout adds new head.
 r2493 the backout changeset is a new head - do not forget to merge
Vadim Gelfer
tests: fix output for test-backout
 r2769 (use "backout --merge" if you want to auto-merge)
Vadim Gelfer
print message after backout that tells that backout adds new head.
 r2493 b: No such file or directory
Vadim Gelfer
update test-backout.out
 r2619 adding a
adding b
adding c
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
# backout of merge should fail
abort: cannot back out a merge changeset without --parent
# backout of merge with bad parent should fail
abort: cb9a9f314b8b is not a parent of b2f3bb92043e
# backout of non-merge with parent should fail
abort: cannot use --parent on non-merge changeset
# backout with valid parent should be ok
removing d
changeset 5:11fbd9be634c backs out changeset 4:b2f3bb92043e
rolling back last transaction
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing c
changeset 5:1a5f1a63bf2c backs out changeset 4:b2f3bb92043e