2010-08-14 04:28:53 +04:00
|
|
|
$ hg init basic
|
|
|
|
$ cd basic
|
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
should complain
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ hg backout
|
|
|
|
abort: please specify a revision to backout
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:28:53 +04:00
|
|
|
$ hg backout -r 0 0
|
|
|
|
abort: please specify just one revision
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:28:53 +04:00
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
basic operation
|
2014-05-10 19:49:36 +04:00
|
|
|
(this also tests that editor is invoked if the commit message is not
|
|
|
|
specified explicitly)
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ echo a > a
|
|
|
|
$ hg commit -d '0 0' -A -m a
|
|
|
|
adding a
|
|
|
|
$ echo b >> a
|
|
|
|
$ hg commit -d '1 0' -m b
|
|
|
|
|
2014-05-10 19:49:36 +04:00
|
|
|
$ hg status --rev tip --rev "tip^1"
|
|
|
|
M a
|
|
|
|
$ HGEDITOR=cat hg backout -d '2 0' tip --tool=true
|
2010-08-14 04:28:53 +04:00
|
|
|
reverting a
|
2014-05-10 19:49:36 +04:00
|
|
|
Backed out changeset a820f4f40a57
|
|
|
|
|
|
|
|
|
|
|
|
HG: Enter commit message. Lines beginning with 'HG:' are removed.
|
|
|
|
HG: Leave message empty to abort commit.
|
|
|
|
HG: --
|
|
|
|
HG: user: test
|
|
|
|
HG: branch 'default'
|
|
|
|
HG: changed a
|
2010-08-14 04:28:53 +04:00
|
|
|
changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57
|
|
|
|
$ cat a
|
|
|
|
a
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 2:2929462c3dff tip
|
|
|
|
Backed out changeset a820f4f40a57
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 3 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
2014-12-18 04:26:12 +03:00
|
|
|
commit option
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ hg init commit
|
|
|
|
$ cd commit
|
|
|
|
|
|
|
|
$ echo tomatoes > a
|
|
|
|
$ hg add a
|
|
|
|
$ hg commit -d '0 0' -m tomatoes
|
|
|
|
|
|
|
|
$ echo chair > b
|
|
|
|
$ hg add b
|
|
|
|
$ hg commit -d '1 0' -m chair
|
|
|
|
|
|
|
|
$ echo grapes >> a
|
|
|
|
$ hg commit -d '2 0' -m grapes
|
|
|
|
|
|
|
|
$ hg backout --commit -d '4 0' 1 --tool=:fail
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
changeset 3:1c2161e97c0a backs out changeset 1:22cb4f70d813
|
|
|
|
$ hg summary
|
|
|
|
parent: 3:1c2161e97c0a tip
|
|
|
|
Backed out changeset 22cb4f70d813
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 4 draft
|
2014-12-18 04:26:12 +03:00
|
|
|
|
|
|
|
$ echo ypples > a
|
|
|
|
$ hg commit -d '5 0' -m ypples
|
|
|
|
|
|
|
|
$ hg backout --commit -d '6 0' 2 --tool=:fail
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
use 'hg resolve' to retry unresolved file merges
|
|
|
|
[1]
|
|
|
|
$ hg summary
|
|
|
|
parent: 4:ed99997b793d tip
|
|
|
|
ypples
|
|
|
|
branch: default
|
|
|
|
commit: 1 unresolved (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 5 draft
|
2014-12-18 04:26:12 +03:00
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
file that was removed is recreated
|
2014-05-10 19:49:36 +04:00
|
|
|
(this also tests that editor is not invoked if the commit message is
|
|
|
|
specified explicitly)
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ hg init remove
|
|
|
|
$ cd remove
|
|
|
|
|
|
|
|
$ echo content > a
|
|
|
|
$ hg commit -d '0 0' -A -m a
|
|
|
|
adding a
|
|
|
|
|
|
|
|
$ hg rm a
|
|
|
|
$ hg commit -d '1 0' -m b
|
|
|
|
|
2014-05-10 19:49:36 +04:00
|
|
|
$ HGEDITOR=cat hg backout -d '2 0' tip --tool=true -m "Backed out changeset 76862dcce372"
|
2010-08-14 04:28:53 +04:00
|
|
|
adding a
|
|
|
|
changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372
|
|
|
|
$ cat a
|
|
|
|
content
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 2:de31bdc76c0d tip
|
|
|
|
Backed out changeset 76862dcce372
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 3 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
backout of backout is as if nothing happened
|
2010-08-14 04:28:53 +04:00
|
|
|
|
2010-10-22 20:58:43 +04:00
|
|
|
$ hg backout -d '3 0' --merge tip --tool=true
|
2010-08-14 04:28:53 +04:00
|
|
|
removing a
|
|
|
|
changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d
|
2011-11-16 06:45:14 +04:00
|
|
|
$ test -f a
|
|
|
|
[1]
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 3:7f6d0f120113 tip
|
|
|
|
Backed out changeset de31bdc76c0d
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 4 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
localrepo: make journal.dirstate contain in-memory changes before transaction
Before this patch, in-memory dirstate changes aren't written out at
opening transaction, even though 'journal.dirstate' is created
directly from '.hg/dirstate'.
Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to
restore dirstate, if dirstate is changed and isn't written out before
opening transaction.
In cases below, the condition "dirstate is changed and isn't written
out before opening transaction" isn't satisfied and this problem
doesn't appear:
- "wlock scope" and "transaction scope" are almost equivalent
e.g. 'commit --amend', 'import' and so on
- dirstate changes are written out before opening transaction
e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated
wlock scopes)
On the other hand, 'backout' may satisfy the condition above.
To make 'journal.dirstate' contain in-memory changes before opening
transaction, this patch explicitly invokes 'dirstate.write()' in
'localrepository.transaction()'.
'dirstate.write()' is placed before not "writing journal files out"
but "invoking pretxnopen hooks" for visibility of dirstate changes to
external hook processes.
BTW, in the test script, 'touch -t 200001010000' and 'hg status' are
invoked to make file 'c' surely clean in dirstate, because "clean but
unsure" files indirectly cause 'dirstate.write()' at 'repo.status()'
in 'repo.commit()' (see e1d123a2ee1f for detail) and prevents from
certainly reproducing the issue.
2015-07-30 00:16:12 +03:00
|
|
|
Test that 'hg rollback' restores dirstate just before opening
|
|
|
|
transaction: in-memory dirstate changes should be written into
|
|
|
|
'.hg/journal.dirstate' as expected.
|
|
|
|
|
|
|
|
$ echo 'removed soon' > b
|
|
|
|
$ hg commit -A -d '4 0' -m 'prepare for subsequent removing'
|
|
|
|
adding b
|
|
|
|
$ echo 'newly added' > c
|
|
|
|
$ hg add c
|
|
|
|
$ hg remove b
|
|
|
|
$ hg commit -d '5 0' -m 'prepare for subsequent backout'
|
|
|
|
$ touch -t 200001010000 c
|
|
|
|
$ hg status -A
|
|
|
|
C c
|
|
|
|
$ hg debugstate --nodates
|
|
|
|
n 644 12 set c
|
|
|
|
$ hg backout -d '6 0' -m 'to be rollback-ed soon' -r .
|
|
|
|
adding b
|
|
|
|
removing c
|
|
|
|
changeset 6:4bfec048029d backs out changeset 5:fac0b729a654
|
|
|
|
$ hg rollback -q
|
|
|
|
$ hg status -A
|
|
|
|
A b
|
|
|
|
R c
|
|
|
|
$ hg debugstate --nodates
|
|
|
|
a 0 -1 unset b
|
|
|
|
r 0 0 set c
|
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
across branch
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ hg init branch
|
|
|
|
$ cd branch
|
|
|
|
$ echo a > a
|
|
|
|
$ hg ci -Am0
|
|
|
|
adding a
|
|
|
|
$ echo b > b
|
|
|
|
$ hg ci -Am1
|
|
|
|
adding b
|
|
|
|
$ hg co -C 0
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 0:f7b1eb17ad24
|
|
|
|
0
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: 1 new changesets (update)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 2 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
should fail
|
|
|
|
|
|
|
|
$ hg backout 1
|
2014-02-25 01:42:14 +04:00
|
|
|
abort: cannot backout change that is not an ancestor
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:28:53 +04:00
|
|
|
$ echo c > c
|
|
|
|
$ hg ci -Am2
|
|
|
|
adding c
|
|
|
|
created new head
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 2:db815d6d32e6 tip
|
|
|
|
2
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: 1 new changesets, 2 branch heads (merge)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 3 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
should fail
|
|
|
|
|
|
|
|
$ hg backout 1
|
2014-02-25 01:42:14 +04:00
|
|
|
abort: cannot backout change that is not an ancestor
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 2:db815d6d32e6 tip
|
|
|
|
2
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: 1 new changesets, 2 branch heads (merge)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 3 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
backout with merge
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ hg init merge
|
|
|
|
$ cd merge
|
|
|
|
|
|
|
|
$ echo line 1 > a
|
|
|
|
$ echo line 2 >> a
|
|
|
|
$ hg commit -d '0 0' -A -m a
|
|
|
|
adding a
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 0:59395513a13a tip
|
|
|
|
a
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 1 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
remove line 1
|
|
|
|
|
|
|
|
$ echo line 2 > a
|
|
|
|
$ hg commit -d '1 0' -m b
|
|
|
|
|
|
|
|
$ echo line 3 >> a
|
|
|
|
$ hg commit -d '2 0' -m c
|
|
|
|
|
2010-10-22 20:58:43 +04:00
|
|
|
$ hg backout --merge -d '3 0' 1 --tool=true
|
2010-08-14 04:28:53 +04:00
|
|
|
reverting a
|
|
|
|
created new head
|
|
|
|
changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182
|
|
|
|
merging with changeset 3:26b8ccb9ad91
|
|
|
|
merging a
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg commit -d '4 0' -m d
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 4:c7df5e0b9c09 tip
|
|
|
|
d
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 5 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
check line 1 is back
|
|
|
|
|
|
|
|
$ cat a
|
|
|
|
line 1
|
|
|
|
line 2
|
|
|
|
line 3
|
|
|
|
|
2012-06-11 03:38:32 +04:00
|
|
|
$ cd ..
|
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
backout should not back out subsequent changesets
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ hg init onecs
|
|
|
|
$ cd onecs
|
|
|
|
$ echo 1 > a
|
|
|
|
$ hg commit -d '0 0' -A -m a
|
|
|
|
adding a
|
|
|
|
$ echo 2 >> a
|
|
|
|
$ hg commit -d '1 0' -m b
|
|
|
|
$ echo 1 > b
|
|
|
|
$ hg commit -d '2 0' -A -m c
|
|
|
|
adding b
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 2:882396649954 tip
|
|
|
|
c
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 3 draft
|
2010-09-10 12:28:18 +04:00
|
|
|
|
|
|
|
without --merge
|
2010-10-22 20:58:43 +04:00
|
|
|
$ hg backout -d '3 0' 1 --tool=true
|
2010-09-10 12:28:18 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2014-01-09 05:23:26 +04:00
|
|
|
changeset 22bca4c721e5 backed out, don't forget to commit.
|
2010-09-10 12:28:18 +04:00
|
|
|
$ hg locate b
|
|
|
|
b
|
|
|
|
$ hg update -C tip
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg locate b
|
|
|
|
b
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 2:882396649954 tip
|
|
|
|
c
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 3 draft
|
2010-09-10 12:28:18 +04:00
|
|
|
|
|
|
|
with --merge
|
2010-10-22 20:58:43 +04:00
|
|
|
$ hg backout --merge -d '3 0' 1 --tool=true
|
2010-09-10 12:28:18 +04:00
|
|
|
reverting a
|
2010-08-14 04:28:53 +04:00
|
|
|
created new head
|
|
|
|
changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5
|
2010-09-10 12:28:18 +04:00
|
|
|
merging with changeset 3:3202beb76721
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2010-08-14 04:28:53 +04:00
|
|
|
$ hg locate b
|
|
|
|
b
|
|
|
|
$ hg update -C tip
|
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg locate b
|
2010-09-17 02:51:32 +04:00
|
|
|
[1]
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ hg init m
|
|
|
|
$ cd m
|
|
|
|
$ echo a > a
|
|
|
|
$ hg commit -d '0 0' -A -m a
|
|
|
|
adding a
|
|
|
|
$ echo b > b
|
|
|
|
$ hg commit -d '1 0' -A -m b
|
|
|
|
adding b
|
|
|
|
$ echo c > c
|
|
|
|
$ hg commit -d '2 0' -A -m b
|
|
|
|
adding c
|
|
|
|
$ hg update 1
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo d > d
|
|
|
|
$ hg commit -d '3 0' -A -m c
|
|
|
|
adding d
|
|
|
|
created new head
|
|
|
|
$ hg merge 2
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg commit -d '4 0' -A -m d
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 4:b2f3bb92043e tip
|
|
|
|
d
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 5 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
backout of merge should fail
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ hg backout 4
|
2011-10-08 23:18:18 +04:00
|
|
|
abort: cannot backout a merge changeset
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:28:53 +04:00
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
backout of merge with bad parent should fail
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ hg backout --parent 0 4
|
|
|
|
abort: cb9a9f314b8b is not a parent of b2f3bb92043e
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:28:53 +04:00
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
backout of non-merge with parent should fail
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ hg backout --parent 0 3
|
|
|
|
abort: cannot use --parent on non-merge changeset
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:28:53 +04:00
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
backout with valid parent should be ok
|
2010-08-14 04:28:53 +04:00
|
|
|
|
2010-10-22 20:58:43 +04:00
|
|
|
$ hg backout -d '5 0' --parent 2 4 --tool=true
|
2010-08-14 04:28:53 +04:00
|
|
|
removing d
|
|
|
|
changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 5:10e5328c8435 tip
|
|
|
|
Backed out changeset b2f3bb92043e
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 6 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ hg rollback
|
2011-02-10 11:03:06 +03:00
|
|
|
repository tip rolled back to revision 4 (undo commit)
|
|
|
|
working directory now based on revision 4
|
2010-08-14 04:28:53 +04:00
|
|
|
$ hg update -C
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 4:b2f3bb92043e tip
|
|
|
|
d
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 5 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
2010-10-22 20:58:43 +04:00
|
|
|
$ hg backout -d '6 0' --parent 3 4 --tool=true
|
2010-08-14 04:28:53 +04:00
|
|
|
removing c
|
|
|
|
changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 5:033590168430 tip
|
|
|
|
Backed out changeset b2f3bb92043e
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 6 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
named branches
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
$ hg init named_branches
|
|
|
|
$ cd named_branches
|
|
|
|
|
|
|
|
$ echo default > default
|
|
|
|
$ hg ci -d '0 0' -Am default
|
|
|
|
adding default
|
|
|
|
$ hg branch branch1
|
|
|
|
marked working directory as branch branch1
|
2011-12-09 00:32:44 +04:00
|
|
|
(branches are permanent and global, did you want a bookmark?)
|
2010-08-14 04:28:53 +04:00
|
|
|
$ echo branch1 > file1
|
|
|
|
$ hg ci -d '1 0' -Am file1
|
|
|
|
adding file1
|
|
|
|
$ hg branch branch2
|
|
|
|
marked working directory as branch branch2
|
|
|
|
$ echo branch2 > file2
|
|
|
|
$ hg ci -d '2 0' -Am file2
|
|
|
|
adding file2
|
2010-09-10 12:28:18 +04:00
|
|
|
|
|
|
|
without --merge
|
2010-10-22 20:58:43 +04:00
|
|
|
$ hg backout -r 1 --tool=true
|
2014-01-09 02:53:46 +04:00
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2014-01-09 05:23:26 +04:00
|
|
|
changeset bf1602f437f3 backed out, don't forget to commit.
|
2010-09-10 12:28:18 +04:00
|
|
|
$ hg branch
|
|
|
|
branch2
|
|
|
|
$ hg status -A
|
|
|
|
R file1
|
|
|
|
C default
|
|
|
|
C file2
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 2:45bbcd363bf0 tip
|
|
|
|
file2
|
|
|
|
branch: branch2
|
|
|
|
commit: 1 removed
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 3 draft
|
2010-09-10 12:28:18 +04:00
|
|
|
|
|
|
|
with --merge
|
2014-05-31 19:08:32 +04:00
|
|
|
(this also tests that editor is invoked if '--edit' is specified
|
|
|
|
explicitly regardless of '--message')
|
|
|
|
|
2010-09-10 12:28:18 +04:00
|
|
|
$ hg update -qC
|
2014-05-31 19:08:32 +04:00
|
|
|
$ HGEDITOR=cat hg backout --merge -d '3 0' -r 1 -m 'backout on branch1' --tool=true --edit
|
2010-08-14 04:28:53 +04:00
|
|
|
removing file1
|
2014-05-31 19:08:32 +04:00
|
|
|
backout on branch1
|
|
|
|
|
|
|
|
|
|
|
|
HG: Enter commit message. Lines beginning with 'HG:' are removed.
|
|
|
|
HG: Leave message empty to abort commit.
|
|
|
|
HG: --
|
|
|
|
HG: user: test
|
|
|
|
HG: branch 'branch2'
|
|
|
|
HG: removed file1
|
2010-08-14 04:28:53 +04:00
|
|
|
created new head
|
|
|
|
changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3
|
2010-09-10 12:28:18 +04:00
|
|
|
merging with changeset 3:d4e8f6db59fb
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 2:45bbcd363bf0
|
|
|
|
file2
|
|
|
|
parent: 3:d4e8f6db59fb tip
|
|
|
|
backout on branch1
|
|
|
|
branch: branch2
|
|
|
|
commit: 1 removed (merge)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 4 draft
|
2010-09-10 12:28:18 +04:00
|
|
|
$ hg update -q -C 2
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
on branch2 with branch1 not merged, so file1 should still exist:
|
|
|
|
|
|
|
|
$ hg id
|
|
|
|
45bbcd363bf0 (branch2)
|
|
|
|
$ hg st -A
|
|
|
|
C default
|
|
|
|
C file1
|
|
|
|
C file2
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 2:45bbcd363bf0
|
|
|
|
file2
|
|
|
|
branch: branch2
|
|
|
|
commit: (clean)
|
|
|
|
update: 1 new changesets, 2 branch heads (merge)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 4 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
on branch2 with branch1 merged, so file1 should be gone:
|
|
|
|
|
|
|
|
$ hg merge
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg ci -d '4 0' -m 'merge backout of branch1'
|
|
|
|
$ hg id
|
|
|
|
22149cdde76d (branch2) tip
|
|
|
|
$ hg st -A
|
|
|
|
C default
|
|
|
|
C file2
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 4:22149cdde76d tip
|
|
|
|
merge backout of branch1
|
|
|
|
branch: branch2
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 5 draft
|
2010-08-14 04:28:53 +04:00
|
|
|
|
|
|
|
on branch1, so no file1 and file2:
|
|
|
|
|
|
|
|
$ hg co -C branch1
|
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg id
|
|
|
|
bf1602f437f3 (branch1)
|
|
|
|
$ hg st -A
|
|
|
|
C default
|
|
|
|
C file1
|
2014-01-09 05:15:22 +04:00
|
|
|
$ hg summary
|
|
|
|
parent: 1:bf1602f437f3
|
|
|
|
file1
|
|
|
|
branch: branch1
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 5 draft
|
2012-06-11 03:38:32 +04:00
|
|
|
|
|
|
|
$ cd ..
|
2014-02-26 06:45:01 +04:00
|
|
|
|
2014-03-08 13:52:16 +04:00
|
|
|
backout of empty changeset (issue4190)
|
|
|
|
|
|
|
|
$ hg init emptycommit
|
|
|
|
$ cd emptycommit
|
|
|
|
|
|
|
|
$ touch file1
|
|
|
|
$ hg ci -Aqm file1
|
|
|
|
$ hg branch -q branch1
|
|
|
|
$ hg ci -qm branch1
|
|
|
|
$ hg backout -v 1
|
|
|
|
resolving manifests
|
|
|
|
nothing changed
|
|
|
|
[1]
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
2014-02-26 06:45:01 +04:00
|
|
|
|
|
|
|
Test usage of `hg resolve` in case of conflict
|
|
|
|
(issue4163)
|
|
|
|
|
|
|
|
$ hg init issue4163
|
|
|
|
$ cd issue4163
|
|
|
|
$ touch foo
|
|
|
|
$ hg add foo
|
|
|
|
$ cat > foo << EOF
|
|
|
|
> one
|
|
|
|
> two
|
|
|
|
> three
|
|
|
|
> four
|
|
|
|
> five
|
|
|
|
> six
|
|
|
|
> seven
|
|
|
|
> height
|
|
|
|
> nine
|
|
|
|
> ten
|
|
|
|
> EOF
|
|
|
|
$ hg ci -m 'initial'
|
|
|
|
$ cat > foo << EOF
|
|
|
|
> one
|
|
|
|
> two
|
|
|
|
> THREE
|
|
|
|
> four
|
|
|
|
> five
|
|
|
|
> six
|
|
|
|
> seven
|
|
|
|
> height
|
|
|
|
> nine
|
|
|
|
> ten
|
|
|
|
> EOF
|
|
|
|
$ hg ci -m 'capital three'
|
|
|
|
$ cat > foo << EOF
|
|
|
|
> one
|
|
|
|
> two
|
|
|
|
> THREE
|
|
|
|
> four
|
|
|
|
> five
|
|
|
|
> six
|
|
|
|
> seven
|
|
|
|
> height
|
|
|
|
> nine
|
|
|
|
> TEN
|
|
|
|
> EOF
|
|
|
|
$ hg ci -m 'capital ten'
|
|
|
|
$ hg backout -r 'desc("capital three")' --tool internal:fail
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
use 'hg resolve' to retry unresolved file merges
|
|
|
|
[1]
|
|
|
|
$ hg status
|
|
|
|
$ hg resolve -l # still unresolved
|
|
|
|
U foo
|
|
|
|
$ hg summary
|
|
|
|
parent: 2:b71750c4b0fd tip
|
|
|
|
capital ten
|
|
|
|
branch: default
|
|
|
|
commit: 1 unresolved (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 3 draft
|
2014-02-26 06:45:01 +04:00
|
|
|
$ hg resolve --all --debug
|
|
|
|
picked tool 'internal:merge' for foo (binary False symlink False)
|
|
|
|
merging foo
|
|
|
|
my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
|
|
|
|
premerge successful
|
2014-07-26 05:32:49 +04:00
|
|
|
(no more unresolved files)
|
2014-02-26 06:45:01 +04:00
|
|
|
$ hg status
|
|
|
|
M foo
|
|
|
|
? foo.orig
|
|
|
|
$ hg resolve -l
|
|
|
|
R foo
|
|
|
|
$ hg summary
|
|
|
|
parent: 2:b71750c4b0fd tip
|
|
|
|
capital ten
|
|
|
|
branch: default
|
|
|
|
commit: 1 modified, 1 unknown
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 3 draft
|
2014-02-26 06:45:01 +04:00
|
|
|
$ cat foo
|
|
|
|
one
|
|
|
|
two
|
|
|
|
three
|
|
|
|
four
|
|
|
|
five
|
|
|
|
six
|
|
|
|
seven
|
|
|
|
height
|
|
|
|
nine
|
|
|
|
TEN
|
|
|
|
|
|
|
|
|