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

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

Update on pull -u when heads were closed (fixes issue666)....
Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r4726:f6e961c0 default
r5080:73fdc8bd default
Show More
test-backout.out
53 lines | 1.7 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
# backout with merge
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 3:3eb045e364a4 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
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)
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
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