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

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

Remove unexpected "Alternately" word from tip help.
Remove unexpected "Alternately" word from tip help.
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r6367:51984a24 default
Show More
test-backout.out
94 lines | 2.9 KiB | text/plain | TextLexer
/ tests / test-backout.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Fix and test 'hg backout' without or with too many revisions.
 r4726 # should complain
abort: please specify a revision to backout
abort: please specify just one revision
Vadim Gelfer
add backout command....
 r2158 # basic operation
adding a
Vadim Gelfer
revert: better fix for not printing 'reverting' message
 r2407 reverting a
Matt Mackall
backout: report short hash in commit message
 r4718 changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57
Vadim Gelfer
add backout command....
 r2158 a
# file that was removed is recreated
adding a
adding a
Matt Mackall
backout: report short hash in commit message
 r4718 changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372
Vadim Gelfer
add backout command....
 r2158 content
# backout of backout is as if nothing happened
removing a
Matt Mackall
backout: report short hash in commit message
 r4718 changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d
Vadim Gelfer
add backout command....
 r2158 cat: a: No such file or directory
Matt Mackall
backout: disallow across branches (issue655)
 r5568 # across branch
adding a
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
abort: cannot back out change on a different branch
adding c
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
backout: disallow across branches (issue655)
 r5568 abort: cannot back out change on a different branch
Vadim Gelfer
add backout command....
 r2158 # backout with merge
adding a
Vadim Gelfer
revert: better fix for not printing 'reverting' message
 r2407 reverting a
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Gilles Moris
Reverse the way backout is doing the merge...
 r6161 changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182
merging with changeset 3:26b8ccb9ad91
Vadim Gelfer
add backout command....
 r2158 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
Gilles Moris
Reverse the way backout is doing the merge...
 r6161 line 2
line 3
Brendan Cully
Test case for #295
 r2492 # backout should not back out subsequent changesets
adding a
adding b
reverting a
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
backout: report short hash in commit message
 r4718 changeset 3:3202beb76721 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)
Gilles Moris
Reverse the way backout is doing the merge...
 r6161 b
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
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
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Vadim Gelfer
update test-backout.out
 r2619 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
Matt Mackall
backout: report short hash in commit message
 r4718 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
Vadim Gelfer
update test-backout.out
 r2619 rolling back last transaction
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing c
Matt Mackall
backout: report short hash in commit message
 r4718 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
Thomas Arendsen Hein
Add test case for backout on named branches (issue665)
 r6162 # named branches
adding default
marked working directory as branch branch1
adding file1
marked working directory as branch branch2
adding file2
removing file1
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Thomas Arendsen Hein
Add test case for backout on named branches (issue665)
 r6162 changeset 3:f1c642b1d8e5 backs out changeset 1:bf1602f437f3
the backout changeset is a new head - do not forget to merge
(use "backout --merge" if you want to auto-merge)
% on branch2 with branch1 not merged, so file1 should still exist:
45bbcd363bf0 (branch2)
C default
C file1
C file2
% on branch2 with branch1 merged, so file1 should be gone:
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
21d4dc6f9a41 (branch2) tip
C default
C file2
% on branch1, so no file1 and file2:
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f1c642b1d8e5 (branch1)
C default