annotate tests/test-backout.t @ 24547:495f3e665b27

json: implement {branches} template
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 30 Mar 2015 21:37:24 -0700
parents 7cfe58983bff
children 1ef96a3b8b89
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
1 $ hg init basic
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
2 $ cd basic
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
3
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
4 should complain
4365
46280c004f22 change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2614
diff changeset
5
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
6 $ hg backout
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
7 abort: please specify a revision to backout
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11856
diff changeset
8 [255]
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
9 $ hg backout -r 0 0
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
10 abort: please specify just one revision
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11856
diff changeset
11 [255]
4726
f6e961c0155b Fix and test 'hg backout' without or with too many revisions.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4365
diff changeset
12
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
13 basic operation
21413
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
14 (this also tests that editor is invoked if the commit message is not
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
15 specified explicitly)
4726
f6e961c0155b Fix and test 'hg backout' without or with too many revisions.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4365
diff changeset
16
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
17 $ echo a > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
18 $ hg commit -d '0 0' -A -m a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
19 adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
20 $ echo b >> a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
21 $ hg commit -d '1 0' -m b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
22
21413
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
23 $ hg status --rev tip --rev "tip^1"
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
24 M a
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
25 $ HGEDITOR=cat hg backout -d '2 0' tip --tool=true
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
26 reverting a
21413
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
27 Backed out changeset a820f4f40a57
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
28
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
29
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
30 HG: Enter commit message. Lines beginning with 'HG:' are removed.
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
31 HG: Leave message empty to abort commit.
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
32 HG: --
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
33 HG: user: test
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
34 HG: branch 'default'
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
35 HG: changed a
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
36 changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
37 $ cat a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
38 a
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
39 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
40 parent: 2:2929462c3dff tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
41 Backed out changeset a820f4f40a57
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
42 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
43 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
44 update: (current)
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
45
23615
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
46 commit option
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
47
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
48 $ cd ..
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
49 $ hg init commit
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
50 $ cd commit
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
51
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
52 $ echo tomatoes > a
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
53 $ hg add a
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
54 $ hg commit -d '0 0' -m tomatoes
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
55
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
56 $ echo chair > b
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
57 $ hg add b
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
58 $ hg commit -d '1 0' -m chair
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
59
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
60 $ echo grapes >> a
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
61 $ hg commit -d '2 0' -m grapes
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
62
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
63 $ hg backout --commit -d '4 0' 1 --tool=:fail
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
64 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
65 changeset 3:1c2161e97c0a backs out changeset 1:22cb4f70d813
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
66 $ hg summary
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
67 parent: 3:1c2161e97c0a tip
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
68 Backed out changeset 22cb4f70d813
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
69 branch: default
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
70 commit: (clean)
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
71 update: (current)
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
72
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
73 $ echo ypples > a
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
74 $ hg commit -d '5 0' -m ypples
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
75
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
76 $ hg backout --commit -d '6 0' 2 --tool=:fail
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
78 use 'hg resolve' to retry unresolved file merges
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
79 [1]
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
80 $ hg summary
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
81 parent: 4:ed99997b793d tip
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
82 ypples
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
83 branch: default
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
84 commit: 1 unresolved (clean)
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
85 update: (current)
7cfe58983bff backout: add --commit option
Mateusz Kwapich <mitrandir@fb.com>
parents: 21947
diff changeset
86
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
87 file that was removed is recreated
21413
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
88 (this also tests that editor is not invoked if the commit message is
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
89 specified explicitly)
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
90
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
91 $ cd ..
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
92 $ hg init remove
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
93 $ cd remove
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
94
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
95 $ echo content > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
96 $ hg commit -d '0 0' -A -m a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
97 adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
98
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
99 $ hg rm a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
100 $ hg commit -d '1 0' -m b
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
101
21413
edc55317de90 backout: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21267
diff changeset
102 $ HGEDITOR=cat hg backout -d '2 0' tip --tool=true -m "Backed out changeset 76862dcce372"
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
103 adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
104 changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
105 $ cat a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
106 content
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
107 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
108 parent: 2:de31bdc76c0d tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
109 Backed out changeset 76862dcce372
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
110 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
111 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
112 update: (current)
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
113
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
114 backout of backout is as if nothing happened
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
115
12810
a68ccfd9c7be backout: add --tool argument for specifying merge tool
Steve Borho <steve@borho.org>
parents: 12727
diff changeset
116 $ hg backout -d '3 0' --merge tip --tool=true
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
117 removing a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
118 changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d
15515
21766d5531cb tests: remove hacks for testing if file or directory exists
Mads Kiilerich <mads@kiilerich.com>
parents: 15211
diff changeset
119 $ test -f a
21766d5531cb tests: remove hacks for testing if file or directory exists
Mads Kiilerich <mads@kiilerich.com>
parents: 15211
diff changeset
120 [1]
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
121 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
122 parent: 3:7f6d0f120113 tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
123 Backed out changeset de31bdc76c0d
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
124 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
125 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
126 update: (current)
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
127
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
128 across branch
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
129
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
130 $ cd ..
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
131 $ hg init branch
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
132 $ cd branch
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
133 $ echo a > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
134 $ hg ci -Am0
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
135 adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
136 $ echo b > b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
137 $ hg ci -Am1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
138 adding b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
139 $ hg co -C 0
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
140 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
141 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
142 parent: 0:f7b1eb17ad24
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
143 0
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
144 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
145 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
146 update: 1 new changesets (update)
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
147
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
148 should fail
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
149
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
150 $ hg backout 1
20791
8dd867bd67e1 backout: improve confusing 'cannot backout change on a different branch' abort
Mads Kiilerich <madski@unity3d.com>
parents: 20594
diff changeset
151 abort: cannot backout change that is not an ancestor
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11856
diff changeset
152 [255]
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
153 $ echo c > c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
154 $ hg ci -Am2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
155 adding c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
156 created new head
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
157 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
158 parent: 2:db815d6d32e6 tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
159 2
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
160 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
161 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
162 update: 1 new changesets, 2 branch heads (merge)
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
163
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
164 should fail
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
165
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
166 $ hg backout 1
20791
8dd867bd67e1 backout: improve confusing 'cannot backout change on a different branch' abort
Mads Kiilerich <madski@unity3d.com>
parents: 20594
diff changeset
167 abort: cannot backout change that is not an ancestor
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11856
diff changeset
168 [255]
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
169 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
170 parent: 2:db815d6d32e6 tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
171 2
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
172 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
173 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
174 update: 1 new changesets, 2 branch heads (merge)
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
175
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
176 backout with merge
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
177
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
178 $ cd ..
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
179 $ hg init merge
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
180 $ cd merge
5568
de620356064f backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents: 4726
diff changeset
181
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
182 $ echo line 1 > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
183 $ echo line 2 >> a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
184 $ hg commit -d '0 0' -A -m a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
185 adding a
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
186 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
187 parent: 0:59395513a13a tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
188 a
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
189 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
190 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
191 update: (current)
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
192
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
193 remove line 1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
194
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
195 $ echo line 2 > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
196 $ hg commit -d '1 0' -m b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
197
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
198 $ echo line 3 >> a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
199 $ hg commit -d '2 0' -m c
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
200
12810
a68ccfd9c7be backout: add --tool argument for specifying merge tool
Steve Borho <steve@borho.org>
parents: 12727
diff changeset
201 $ hg backout --merge -d '3 0' 1 --tool=true
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
202 reverting a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
203 created new head
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
204 changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
205 merging with changeset 3:26b8ccb9ad91
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
206 merging a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
207 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
208 (branch merge, don't forget to commit)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
209 $ hg commit -d '4 0' -m d
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
210 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
211 parent: 4:c7df5e0b9c09 tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
212 d
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
213 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
214 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
215 update: (current)
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
216
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
217 check line 1 is back
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
218
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
219 $ cat a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
220 line 1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
221 line 2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
222 line 3
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
223
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 15623
diff changeset
224 $ cd ..
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 15623
diff changeset
225
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
226 backout should not back out subsequent changesets
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
227
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
228 $ hg init onecs
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
229 $ cd onecs
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
230 $ echo 1 > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
231 $ hg commit -d '0 0' -A -m a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
232 adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
233 $ echo 2 >> a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
234 $ hg commit -d '1 0' -m b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
235 $ echo 1 > b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
236 $ hg commit -d '2 0' -A -m c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
237 adding b
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
238 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
239 parent: 2:882396649954 tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
240 c
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
241 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
242 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
243 update: (current)
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
244
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
245 without --merge
12810
a68ccfd9c7be backout: add --tool argument for specifying merge tool
Steve Borho <steve@borho.org>
parents: 12727
diff changeset
246 $ hg backout -d '3 0' 1 --tool=true
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
247 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
20276
6545770bd379 backout: add a message after backout that need manual commit
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20275
diff changeset
248 changeset 22bca4c721e5 backed out, don't forget to commit.
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
249 $ hg locate b
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
250 b
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
251 $ hg update -C tip
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
252 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
253 $ hg locate b
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
254 b
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
255 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
256 parent: 2:882396649954 tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
257 c
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
258 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
259 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
260 update: (current)
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
261
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
262 with --merge
12810
a68ccfd9c7be backout: add --tool argument for specifying merge tool
Steve Borho <steve@borho.org>
parents: 12727
diff changeset
263 $ hg backout --merge -d '3 0' 1 --tool=true
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
264 reverting a
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
265 created new head
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
266 changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
267 merging with changeset 3:3202beb76721
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
268 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
269 (branch merge, don't forget to commit)
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
270 $ hg locate b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
271 b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
272 $ hg update -C tip
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
273 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
274 $ hg locate b
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11856
diff changeset
275 [1]
2492
2f4addf56715 Test case for #295
Brendan Cully <brendan@kublai.com>
parents: 2186
diff changeset
276
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
277 $ cd ..
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
278 $ hg init m
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
279 $ cd m
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
280 $ echo a > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
281 $ hg commit -d '0 0' -A -m a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
282 adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
283 $ echo b > b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
284 $ hg commit -d '1 0' -A -m b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
285 adding b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
286 $ echo c > c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
287 $ hg commit -d '2 0' -A -m b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
288 adding c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
289 $ hg update 1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
290 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
291 $ echo d > d
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
292 $ hg commit -d '3 0' -A -m c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
293 adding d
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
294 created new head
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
295 $ hg merge 2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
297 (branch merge, don't forget to commit)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
298 $ hg commit -d '4 0' -A -m d
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
299 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
300 parent: 4:b2f3bb92043e tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
301 d
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
302 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
303 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
304 update: (current)
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
305
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
306 backout of merge should fail
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
307
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
308 $ hg backout 4
15211
1209de02034e backout: deprecate/hide support for backing out merges
Matt Mackall <mpm@selenic.com>
parents: 13446
diff changeset
309 abort: cannot backout a merge changeset
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11856
diff changeset
310 [255]
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
311
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
312 backout of merge with bad parent should fail
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
313
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
314 $ hg backout --parent 0 4
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
315 abort: cb9a9f314b8b is not a parent of b2f3bb92043e
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11856
diff changeset
316 [255]
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
317
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
318 backout of non-merge with parent should fail
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
319
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
320 $ hg backout --parent 0 3
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
321 abort: cannot use --parent on non-merge changeset
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11856
diff changeset
322 [255]
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
323
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
324 backout with valid parent should be ok
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
325
12810
a68ccfd9c7be backout: add --tool argument for specifying merge tool
Steve Borho <steve@borho.org>
parents: 12727
diff changeset
326 $ hg backout -d '5 0' --parent 2 4 --tool=true
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
327 removing d
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
328 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
329 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
330 parent: 5:10e5328c8435 tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
331 Backed out changeset b2f3bb92043e
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
332 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
333 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
334 update: (current)
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
335
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
336 $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12810
diff changeset
337 repository tip rolled back to revision 4 (undo commit)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12810
diff changeset
338 working directory now based on revision 4
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
339 $ hg update -C
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
340 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
341 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
342 parent: 4:b2f3bb92043e tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
343 d
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
344 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
345 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
346 update: (current)
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
347
12810
a68ccfd9c7be backout: add --tool argument for specifying merge tool
Steve Borho <steve@borho.org>
parents: 12727
diff changeset
348 $ hg backout -d '6 0' --parent 3 4 --tool=true
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
349 removing c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
350 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
351 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
352 parent: 5:033590168430 tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
353 Backed out changeset b2f3bb92043e
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
354 branch: default
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
355 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
356 update: (current)
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
357
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
358 $ cd ..
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
359
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12327
diff changeset
360 named branches
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
361
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
362 $ hg init named_branches
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
363 $ cd named_branches
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
364
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
365 $ echo default > default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
366 $ hg ci -d '0 0' -Am default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
367 adding default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
368 $ hg branch branch1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
369 marked working directory as branch branch1
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 15211
diff changeset
370 (branches are permanent and global, did you want a bookmark?)
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
371 $ echo branch1 > file1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
372 $ hg ci -d '1 0' -Am file1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
373 adding file1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
374 $ hg branch branch2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
375 marked working directory as branch branch2
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 15211
diff changeset
376 (branches are permanent and global, did you want a bookmark?)
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
377 $ echo branch2 > file2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
378 $ hg ci -d '2 0' -Am file2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
379 adding file2
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
380
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
381 without --merge
12810
a68ccfd9c7be backout: add --tool argument for specifying merge tool
Steve Borho <steve@borho.org>
parents: 12727
diff changeset
382 $ hg backout -r 1 --tool=true
20275
2123d27ff75d backout: avoid update on simple case.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20270
diff changeset
383 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
20276
6545770bd379 backout: add a message after backout that need manual commit
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20275
diff changeset
384 changeset bf1602f437f3 backed out, don't forget to commit.
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
385 $ hg branch
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
386 branch2
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
387 $ hg status -A
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
388 R file1
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
389 C default
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
390 C file2
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
391 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
392 parent: 2:45bbcd363bf0 tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
393 file2
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
394 branch: branch2
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
395 commit: 1 removed
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
396 update: (current)
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
397
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
398 with --merge
21712
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
399 (this also tests that editor is invoked if '--edit' is specified
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
400 explicitly regardless of '--message')
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
401
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
402 $ hg update -qC
21712
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
403 $ HGEDITOR=cat hg backout --merge -d '3 0' -r 1 -m 'backout on branch1' --tool=true --edit
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
404 removing file1
21712
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
405 backout on branch1
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
406
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
407
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
408 HG: Enter commit message. Lines beginning with 'HG:' are removed.
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
409 HG: Leave message empty to abort commit.
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
410 HG: --
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
411 HG: user: test
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
412 HG: branch 'branch2'
51035af2c0bf backout: accept '--edit' like other commands creating new changeset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21413
diff changeset
413 HG: removed file1
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
414 created new head
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
415 changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
416 merging with changeset 3:d4e8f6db59fb
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
417 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
418 (branch merge, don't forget to commit)
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
419 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
420 parent: 2:45bbcd363bf0
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
421 file2
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
422 parent: 3:d4e8f6db59fb tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
423 backout on branch1
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
424 branch: branch2
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
425 commit: 1 removed (merge)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
426 update: (current)
12727
52971985be14 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr>
parents: 12328
diff changeset
427 $ hg update -q -C 2
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
428
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
429 on branch2 with branch1 not merged, so file1 should still exist:
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
430
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
431 $ hg id
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
432 45bbcd363bf0 (branch2)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
433 $ hg st -A
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
434 C default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
435 C file1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
436 C file2
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
437 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
438 parent: 2:45bbcd363bf0
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
439 file2
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
440 branch: branch2
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
441 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
442 update: 1 new changesets, 2 branch heads (merge)
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
443
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
444 on branch2 with branch1 merged, so file1 should be gone:
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
445
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
446 $ hg merge
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
447 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
448 (branch merge, don't forget to commit)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
449 $ hg ci -d '4 0' -m 'merge backout of branch1'
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
450 $ hg id
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
451 22149cdde76d (branch2) tip
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
452 $ hg st -A
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
453 C default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
454 C file2
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
455 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
456 parent: 4:22149cdde76d tip
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
457 merge backout of branch1
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
458 branch: branch2
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
459 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
460 update: (current)
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
461
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
462 on branch1, so no file1 and file2:
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
463
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
464 $ hg co -C branch1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
465 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
466 $ hg id
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
467 bf1602f437f3 (branch1)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
468 $ hg st -A
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
469 C default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
470 C file1
20270
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
471 $ hg summary
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
472 parent: 1:bf1602f437f3
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
473 file1
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
474 branch: branch1
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
475 commit: (clean)
0763d829cbea test-backout: add multiple summary calls to monitor result wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 16912
diff changeset
476 update: (current)
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 15623
diff changeset
477
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 15623
diff changeset
478 $ cd ..
20594
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
479
20872
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
480 backout of empty changeset (issue4190)
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
481
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
482 $ hg init emptycommit
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
483 $ cd emptycommit
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
484
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
485 $ touch file1
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
486 $ hg ci -Aqm file1
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
487 $ hg branch -q branch1
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
488 $ hg ci -qm branch1
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
489 $ hg backout -v 1
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
490 resolving manifests
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
491 nothing changed
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
492 [1]
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
493
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
494 $ cd ..
3f83fc5cfe71 backout: correct commit status of no changes made (BC) (issue4190)
Yuya Nishihara <yuya@tcha.org>
parents: 20594
diff changeset
495
20594
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
496
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
497 Test usage of `hg resolve` in case of conflict
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
498 (issue4163)
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
499
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
500 $ hg init issue4163
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
501 $ cd issue4163
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
502 $ touch foo
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
503 $ hg add foo
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
504 $ cat > foo << EOF
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
505 > one
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
506 > two
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
507 > three
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
508 > four
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
509 > five
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
510 > six
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
511 > seven
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
512 > height
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
513 > nine
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
514 > ten
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
515 > EOF
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
516 $ hg ci -m 'initial'
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
517 $ cat > foo << EOF
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
518 > one
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
519 > two
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
520 > THREE
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
521 > four
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
522 > five
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
523 > six
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
524 > seven
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
525 > height
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
526 > nine
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
527 > ten
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
528 > EOF
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
529 $ hg ci -m 'capital three'
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
530 $ cat > foo << EOF
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
531 > one
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
532 > two
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
533 > THREE
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
534 > four
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
535 > five
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
536 > six
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
537 > seven
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
538 > height
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
539 > nine
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
540 > TEN
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
541 > EOF
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
542 $ hg ci -m 'capital ten'
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
543 $ hg backout -r 'desc("capital three")' --tool internal:fail
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
544 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
545 use 'hg resolve' to retry unresolved file merges
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
546 [1]
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
547 $ hg status
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
548 $ hg resolve -l # still unresolved
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
549 U foo
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
550 $ hg summary
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
551 parent: 2:b71750c4b0fd tip
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
552 capital ten
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
553 branch: default
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
554 commit: 1 unresolved (clean)
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
555 update: (current)
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
556 $ hg resolve --all --debug
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
557 picked tool 'internal:merge' for foo (binary False symlink False)
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
558 merging foo
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
559 my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
560 premerge successful
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21712
diff changeset
561 (no more unresolved files)
20594
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
562 $ hg status
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
563 M foo
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
564 ? foo.orig
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
565 $ hg resolve -l
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
566 R foo
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
567 $ hg summary
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
568 parent: 2:b71750c4b0fd tip
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
569 capital ten
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
570 branch: default
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
571 commit: 1 modified, 1 unknown
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
572 update: (current)
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
573 $ cat foo
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
574 one
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
575 two
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
576 three
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
577 four
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
578 five
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
579 six
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
580 seven
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
581 height
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
582 nine
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
583 TEN
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
584
ba619c50a355 resolve: use "other" changeset from merge state (issue4163)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20276
diff changeset
585