Show More
@@ -1,851 +1,851 b'' | |||||
1 | $ echo "[extensions]" >> $HGRCPATH |
|
1 | $ echo "[extensions]" >> $HGRCPATH | |
2 | $ echo "strip=" >> $HGRCPATH |
|
2 | $ echo "strip=" >> $HGRCPATH | |
3 |
|
3 | |||
4 | $ restore() { |
|
4 | $ restore() { | |
5 | > hg unbundle -q .hg/strip-backup/* |
|
5 | > hg unbundle -q .hg/strip-backup/* | |
6 | > rm .hg/strip-backup/* |
|
6 | > rm .hg/strip-backup/* | |
7 | > } |
|
7 | > } | |
8 | $ teststrip() { |
|
8 | $ teststrip() { | |
9 | > hg up -C $1 |
|
9 | > hg up -C $1 | |
10 | > echo % before update $1, strip $2 |
|
10 | > echo % before update $1, strip $2 | |
11 | > hg parents |
|
11 | > hg parents | |
12 | > hg --traceback strip $2 |
|
12 | > hg --traceback strip $2 | |
13 | > echo % after update $1, strip $2 |
|
13 | > echo % after update $1, strip $2 | |
14 | > hg parents |
|
14 | > hg parents | |
15 | > restore |
|
15 | > restore | |
16 | > } |
|
16 | > } | |
17 |
|
17 | |||
18 | $ hg init test |
|
18 | $ hg init test | |
19 | $ cd test |
|
19 | $ cd test | |
20 |
|
20 | |||
21 | $ echo foo > bar |
|
21 | $ echo foo > bar | |
22 | $ hg ci -Ama |
|
22 | $ hg ci -Ama | |
23 | adding bar |
|
23 | adding bar | |
24 |
|
24 | |||
25 | $ echo more >> bar |
|
25 | $ echo more >> bar | |
26 | $ hg ci -Amb |
|
26 | $ hg ci -Amb | |
27 |
|
27 | |||
28 | $ echo blah >> bar |
|
28 | $ echo blah >> bar | |
29 | $ hg ci -Amc |
|
29 | $ hg ci -Amc | |
30 |
|
30 | |||
31 | $ hg up 1 |
|
31 | $ hg up 1 | |
32 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
32 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
33 | $ echo blah >> bar |
|
33 | $ echo blah >> bar | |
34 | $ hg ci -Amd |
|
34 | $ hg ci -Amd | |
35 | created new head |
|
35 | created new head | |
36 |
|
36 | |||
37 | $ echo final >> bar |
|
37 | $ echo final >> bar | |
38 | $ hg ci -Ame |
|
38 | $ hg ci -Ame | |
39 |
|
39 | |||
40 | $ hg log |
|
40 | $ hg log | |
41 | changeset: 4:443431ffac4f |
|
41 | changeset: 4:443431ffac4f | |
42 | tag: tip |
|
42 | tag: tip | |
43 | user: test |
|
43 | user: test | |
44 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
44 | date: Thu Jan 01 00:00:00 1970 +0000 | |
45 | summary: e |
|
45 | summary: e | |
46 |
|
46 | |||
47 | changeset: 3:65bd5f99a4a3 |
|
47 | changeset: 3:65bd5f99a4a3 | |
48 | parent: 1:ef3a871183d7 |
|
48 | parent: 1:ef3a871183d7 | |
49 | user: test |
|
49 | user: test | |
50 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
50 | date: Thu Jan 01 00:00:00 1970 +0000 | |
51 | summary: d |
|
51 | summary: d | |
52 |
|
52 | |||
53 | changeset: 2:264128213d29 |
|
53 | changeset: 2:264128213d29 | |
54 | user: test |
|
54 | user: test | |
55 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
55 | date: Thu Jan 01 00:00:00 1970 +0000 | |
56 | summary: c |
|
56 | summary: c | |
57 |
|
57 | |||
58 | changeset: 1:ef3a871183d7 |
|
58 | changeset: 1:ef3a871183d7 | |
59 | user: test |
|
59 | user: test | |
60 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
60 | date: Thu Jan 01 00:00:00 1970 +0000 | |
61 | summary: b |
|
61 | summary: b | |
62 |
|
62 | |||
63 | changeset: 0:9ab35a2d17cb |
|
63 | changeset: 0:9ab35a2d17cb | |
64 | user: test |
|
64 | user: test | |
65 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
65 | date: Thu Jan 01 00:00:00 1970 +0000 | |
66 | summary: a |
|
66 | summary: a | |
67 |
|
67 | |||
68 |
|
68 | |||
69 | $ teststrip 4 4 |
|
69 | $ teststrip 4 4 | |
70 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
70 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
71 | % before update 4, strip 4 |
|
71 | % before update 4, strip 4 | |
72 | changeset: 4:443431ffac4f |
|
72 | changeset: 4:443431ffac4f | |
73 | tag: tip |
|
73 | tag: tip | |
74 | user: test |
|
74 | user: test | |
75 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
75 | date: Thu Jan 01 00:00:00 1970 +0000 | |
76 | summary: e |
|
76 | summary: e | |
77 |
|
77 | |||
78 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
78 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
79 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
79 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
80 | % after update 4, strip 4 |
|
80 | % after update 4, strip 4 | |
81 | changeset: 3:65bd5f99a4a3 |
|
81 | changeset: 3:65bd5f99a4a3 | |
82 | tag: tip |
|
82 | tag: tip | |
83 | parent: 1:ef3a871183d7 |
|
83 | parent: 1:ef3a871183d7 | |
84 | user: test |
|
84 | user: test | |
85 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
85 | date: Thu Jan 01 00:00:00 1970 +0000 | |
86 | summary: d |
|
86 | summary: d | |
87 |
|
87 | |||
88 | $ teststrip 4 3 |
|
88 | $ teststrip 4 3 | |
89 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
89 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
90 | % before update 4, strip 3 |
|
90 | % before update 4, strip 3 | |
91 | changeset: 4:443431ffac4f |
|
91 | changeset: 4:443431ffac4f | |
92 | tag: tip |
|
92 | tag: tip | |
93 | user: test |
|
93 | user: test | |
94 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
94 | date: Thu Jan 01 00:00:00 1970 +0000 | |
95 | summary: e |
|
95 | summary: e | |
96 |
|
96 | |||
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
98 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
98 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
99 | % after update 4, strip 3 |
|
99 | % after update 4, strip 3 | |
100 | changeset: 1:ef3a871183d7 |
|
100 | changeset: 1:ef3a871183d7 | |
101 | user: test |
|
101 | user: test | |
102 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
102 | date: Thu Jan 01 00:00:00 1970 +0000 | |
103 | summary: b |
|
103 | summary: b | |
104 |
|
104 | |||
105 | $ teststrip 1 4 |
|
105 | $ teststrip 1 4 | |
106 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
106 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
107 | % before update 1, strip 4 |
|
107 | % before update 1, strip 4 | |
108 | changeset: 1:ef3a871183d7 |
|
108 | changeset: 1:ef3a871183d7 | |
109 | user: test |
|
109 | user: test | |
110 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
110 | date: Thu Jan 01 00:00:00 1970 +0000 | |
111 | summary: b |
|
111 | summary: b | |
112 |
|
112 | |||
113 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
113 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
114 | % after update 1, strip 4 |
|
114 | % after update 1, strip 4 | |
115 | changeset: 1:ef3a871183d7 |
|
115 | changeset: 1:ef3a871183d7 | |
116 | user: test |
|
116 | user: test | |
117 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
117 | date: Thu Jan 01 00:00:00 1970 +0000 | |
118 | summary: b |
|
118 | summary: b | |
119 |
|
119 | |||
120 | $ teststrip 4 2 |
|
120 | $ teststrip 4 2 | |
121 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
121 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
122 | % before update 4, strip 2 |
|
122 | % before update 4, strip 2 | |
123 | changeset: 4:443431ffac4f |
|
123 | changeset: 4:443431ffac4f | |
124 | tag: tip |
|
124 | tag: tip | |
125 | user: test |
|
125 | user: test | |
126 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
126 | date: Thu Jan 01 00:00:00 1970 +0000 | |
127 | summary: e |
|
127 | summary: e | |
128 |
|
128 | |||
129 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
129 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
130 | % after update 4, strip 2 |
|
130 | % after update 4, strip 2 | |
131 | changeset: 3:443431ffac4f |
|
131 | changeset: 3:443431ffac4f | |
132 | tag: tip |
|
132 | tag: tip | |
133 | user: test |
|
133 | user: test | |
134 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
134 | date: Thu Jan 01 00:00:00 1970 +0000 | |
135 | summary: e |
|
135 | summary: e | |
136 |
|
136 | |||
137 | $ teststrip 4 1 |
|
137 | $ teststrip 4 1 | |
138 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
138 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
139 | % before update 4, strip 1 |
|
139 | % before update 4, strip 1 | |
140 | changeset: 4:264128213d29 |
|
140 | changeset: 4:264128213d29 | |
141 | tag: tip |
|
141 | tag: tip | |
142 | parent: 1:ef3a871183d7 |
|
142 | parent: 1:ef3a871183d7 | |
143 | user: test |
|
143 | user: test | |
144 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
144 | date: Thu Jan 01 00:00:00 1970 +0000 | |
145 | summary: c |
|
145 | summary: c | |
146 |
|
146 | |||
147 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
147 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
148 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
148 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
149 | % after update 4, strip 1 |
|
149 | % after update 4, strip 1 | |
150 | changeset: 0:9ab35a2d17cb |
|
150 | changeset: 0:9ab35a2d17cb | |
151 | tag: tip |
|
151 | tag: tip | |
152 | user: test |
|
152 | user: test | |
153 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
153 | date: Thu Jan 01 00:00:00 1970 +0000 | |
154 | summary: a |
|
154 | summary: a | |
155 |
|
155 | |||
156 | $ teststrip null 4 |
|
156 | $ teststrip null 4 | |
157 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
157 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
158 | % before update null, strip 4 |
|
158 | % before update null, strip 4 | |
159 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
159 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
160 | % after update null, strip 4 |
|
160 | % after update null, strip 4 | |
161 |
|
161 | |||
162 | $ hg log |
|
162 | $ hg log | |
163 | changeset: 4:264128213d29 |
|
163 | changeset: 4:264128213d29 | |
164 | tag: tip |
|
164 | tag: tip | |
165 | parent: 1:ef3a871183d7 |
|
165 | parent: 1:ef3a871183d7 | |
166 | user: test |
|
166 | user: test | |
167 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
167 | date: Thu Jan 01 00:00:00 1970 +0000 | |
168 | summary: c |
|
168 | summary: c | |
169 |
|
169 | |||
170 | changeset: 3:443431ffac4f |
|
170 | changeset: 3:443431ffac4f | |
171 | user: test |
|
171 | user: test | |
172 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
172 | date: Thu Jan 01 00:00:00 1970 +0000 | |
173 | summary: e |
|
173 | summary: e | |
174 |
|
174 | |||
175 | changeset: 2:65bd5f99a4a3 |
|
175 | changeset: 2:65bd5f99a4a3 | |
176 | user: test |
|
176 | user: test | |
177 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
177 | date: Thu Jan 01 00:00:00 1970 +0000 | |
178 | summary: d |
|
178 | summary: d | |
179 |
|
179 | |||
180 | changeset: 1:ef3a871183d7 |
|
180 | changeset: 1:ef3a871183d7 | |
181 | user: test |
|
181 | user: test | |
182 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
182 | date: Thu Jan 01 00:00:00 1970 +0000 | |
183 | summary: b |
|
183 | summary: b | |
184 |
|
184 | |||
185 | changeset: 0:9ab35a2d17cb |
|
185 | changeset: 0:9ab35a2d17cb | |
186 | user: test |
|
186 | user: test | |
187 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
187 | date: Thu Jan 01 00:00:00 1970 +0000 | |
188 | summary: a |
|
188 | summary: a | |
189 |
|
189 | |||
190 | $ hg up -C 4 |
|
190 | $ hg up -C 4 | |
191 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
191 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
192 | $ hg parents |
|
192 | $ hg parents | |
193 | changeset: 4:264128213d29 |
|
193 | changeset: 4:264128213d29 | |
194 | tag: tip |
|
194 | tag: tip | |
195 | parent: 1:ef3a871183d7 |
|
195 | parent: 1:ef3a871183d7 | |
196 | user: test |
|
196 | user: test | |
197 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
197 | date: Thu Jan 01 00:00:00 1970 +0000 | |
198 | summary: c |
|
198 | summary: c | |
199 |
|
199 | |||
200 | $ hg --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=INVALID strip 4 |
|
200 | $ hg --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=INVALID strip 4 | |
201 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
201 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
202 | unknown strip-bundle2-version value 'INVALID'; should be one of ['01', '02'] |
|
202 | unknown strip-bundle2-version value 'INVALID'; should be one of ['01', '02'] | |
203 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob) |
|
203 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob) | |
204 | $ hg debugbundle .hg/strip-backup/* |
|
204 | $ hg debugbundle .hg/strip-backup/* | |
205 | 264128213d290d868c54642d13aeaa3675551a78 |
|
205 | 264128213d290d868c54642d13aeaa3675551a78 | |
206 | $ restore |
|
206 | $ restore | |
207 |
|
207 | |||
208 | $ hg up -C 4 |
|
208 | $ hg up -C 4 | |
209 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
209 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
210 | $ hg --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=02 --traceback strip 4 |
|
210 | $ hg --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=02 --traceback strip 4 | |
211 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
211 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
212 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob) |
|
212 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob) | |
213 | $ hg parents |
|
213 | $ hg parents | |
214 | changeset: 1:ef3a871183d7 |
|
214 | changeset: 1:ef3a871183d7 | |
215 | user: test |
|
215 | user: test | |
216 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
216 | date: Thu Jan 01 00:00:00 1970 +0000 | |
217 | summary: b |
|
217 | summary: b | |
218 |
|
218 | |||
219 | $ hg debugbundle .hg/strip-backup/* |
|
219 | $ hg debugbundle .hg/strip-backup/* | |
220 | Stream params: {} |
|
220 | Stream params: {} | |
221 | changegroup -- "{'version': '02'}" |
|
221 | changegroup -- "{'version': '02'}" | |
222 | 264128213d290d868c54642d13aeaa3675551a78 |
|
222 | 264128213d290d868c54642d13aeaa3675551a78 | |
223 | $ hg incoming .hg/strip-backup/* |
|
223 | $ hg incoming .hg/strip-backup/* | |
224 | comparing with .hg/strip-backup/264128213d29-0b39d6bf-backup.hg |
|
224 | comparing with .hg/strip-backup/264128213d29-0b39d6bf-backup.hg | |
225 | searching for changes |
|
225 | searching for changes | |
226 | changeset: 4:264128213d29 |
|
226 | changeset: 4:264128213d29 | |
227 | tag: tip |
|
227 | tag: tip | |
228 | parent: 1:ef3a871183d7 |
|
228 | parent: 1:ef3a871183d7 | |
229 | user: test |
|
229 | user: test | |
230 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
230 | date: Thu Jan 01 00:00:00 1970 +0000 | |
231 | summary: c |
|
231 | summary: c | |
232 |
|
232 | |||
233 | $ restore |
|
233 | $ restore | |
234 | $ hg up -C 4 |
|
234 | $ hg up -C 4 | |
235 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
235 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
236 | $ hg --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=02 --traceback strip 4 |
|
236 | $ hg --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=02 --traceback strip 4 | |
237 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
237 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
238 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob) |
|
238 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob) | |
239 | $ hg parents |
|
239 | $ hg parents | |
240 | changeset: 1:ef3a871183d7 |
|
240 | changeset: 1:ef3a871183d7 | |
241 | user: test |
|
241 | user: test | |
242 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
242 | date: Thu Jan 01 00:00:00 1970 +0000 | |
243 | summary: b |
|
243 | summary: b | |
244 |
|
244 | |||
245 | $ hg debugbundle .hg/strip-backup/* |
|
245 | $ hg debugbundle .hg/strip-backup/* | |
246 | Stream params: {} |
|
246 | Stream params: {} | |
247 | changegroup -- "{'version': '02'}" |
|
247 | changegroup -- "{'version': '02'}" | |
248 | 264128213d290d868c54642d13aeaa3675551a78 |
|
248 | 264128213d290d868c54642d13aeaa3675551a78 | |
249 | $ hg pull .hg/strip-backup/* |
|
249 | $ hg pull .hg/strip-backup/* | |
250 | pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg |
|
250 | pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg | |
251 | searching for changes |
|
251 | searching for changes | |
252 | adding changesets |
|
252 | adding changesets | |
253 | adding manifests |
|
253 | adding manifests | |
254 | adding file changes |
|
254 | adding file changes | |
255 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
255 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
256 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
256 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
257 | $ rm .hg/strip-backup/* |
|
257 | $ rm .hg/strip-backup/* | |
258 | $ hg log --graph |
|
258 | $ hg log --graph | |
259 | o changeset: 4:264128213d29 |
|
259 | o changeset: 4:264128213d29 | |
260 | | tag: tip |
|
260 | | tag: tip | |
261 | | parent: 1:ef3a871183d7 |
|
261 | | parent: 1:ef3a871183d7 | |
262 | | user: test |
|
262 | | user: test | |
263 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
263 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
264 | | summary: c |
|
264 | | summary: c | |
265 | | |
|
265 | | | |
266 | | o changeset: 3:443431ffac4f |
|
266 | | o changeset: 3:443431ffac4f | |
267 | | | user: test |
|
267 | | | user: test | |
268 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
268 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
269 | | | summary: e |
|
269 | | | summary: e | |
270 | | | |
|
270 | | | | |
271 | | o changeset: 2:65bd5f99a4a3 |
|
271 | | o changeset: 2:65bd5f99a4a3 | |
272 | |/ user: test |
|
272 | |/ user: test | |
273 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
273 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
274 | | summary: d |
|
274 | | summary: d | |
275 | | |
|
275 | | | |
276 | @ changeset: 1:ef3a871183d7 |
|
276 | @ changeset: 1:ef3a871183d7 | |
277 | | user: test |
|
277 | | user: test | |
278 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
278 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
279 | | summary: b |
|
279 | | summary: b | |
280 | | |
|
280 | | | |
281 | o changeset: 0:9ab35a2d17cb |
|
281 | o changeset: 0:9ab35a2d17cb | |
282 | user: test |
|
282 | user: test | |
283 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
283 | date: Thu Jan 01 00:00:00 1970 +0000 | |
284 | summary: a |
|
284 | summary: a | |
285 |
|
285 | |||
286 | $ hg up -C 2 |
|
286 | $ hg up -C 2 | |
287 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
287 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
288 | $ hg merge 4 |
|
288 | $ hg merge 4 | |
289 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
289 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
290 | (branch merge, don't forget to commit) |
|
290 | (branch merge, don't forget to commit) | |
291 |
|
291 | |||
292 | before strip of merge parent |
|
292 | before strip of merge parent | |
293 |
|
293 | |||
294 | $ hg parents |
|
294 | $ hg parents | |
295 | changeset: 2:65bd5f99a4a3 |
|
295 | changeset: 2:65bd5f99a4a3 | |
296 | user: test |
|
296 | user: test | |
297 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
297 | date: Thu Jan 01 00:00:00 1970 +0000 | |
298 | summary: d |
|
298 | summary: d | |
299 |
|
299 | |||
300 | changeset: 4:264128213d29 |
|
300 | changeset: 4:264128213d29 | |
301 | tag: tip |
|
301 | tag: tip | |
302 | parent: 1:ef3a871183d7 |
|
302 | parent: 1:ef3a871183d7 | |
303 | user: test |
|
303 | user: test | |
304 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
304 | date: Thu Jan 01 00:00:00 1970 +0000 | |
305 | summary: c |
|
305 | summary: c | |
306 |
|
306 | |||
307 | $ hg strip 4 |
|
307 | $ hg strip 4 | |
308 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
308 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
309 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
309 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
310 |
|
310 | |||
311 | after strip of merge parent |
|
311 | after strip of merge parent | |
312 |
|
312 | |||
313 | $ hg parents |
|
313 | $ hg parents | |
314 | changeset: 1:ef3a871183d7 |
|
314 | changeset: 1:ef3a871183d7 | |
315 | user: test |
|
315 | user: test | |
316 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
316 | date: Thu Jan 01 00:00:00 1970 +0000 | |
317 | summary: b |
|
317 | summary: b | |
318 |
|
318 | |||
319 | $ restore |
|
319 | $ restore | |
320 |
|
320 | |||
321 | $ hg up |
|
321 | $ hg up | |
322 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
322 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
323 | $ hg log -G |
|
323 | $ hg log -G | |
324 | @ changeset: 4:264128213d29 |
|
324 | @ changeset: 4:264128213d29 | |
325 | | tag: tip |
|
325 | | tag: tip | |
326 | | parent: 1:ef3a871183d7 |
|
326 | | parent: 1:ef3a871183d7 | |
327 | | user: test |
|
327 | | user: test | |
328 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
328 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
329 | | summary: c |
|
329 | | summary: c | |
330 | | |
|
330 | | | |
331 | | o changeset: 3:443431ffac4f |
|
331 | | o changeset: 3:443431ffac4f | |
332 | | | user: test |
|
332 | | | user: test | |
333 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
333 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
334 | | | summary: e |
|
334 | | | summary: e | |
335 | | | |
|
335 | | | | |
336 | | o changeset: 2:65bd5f99a4a3 |
|
336 | | o changeset: 2:65bd5f99a4a3 | |
337 | |/ user: test |
|
337 | |/ user: test | |
338 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
338 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
339 | | summary: d |
|
339 | | summary: d | |
340 | | |
|
340 | | | |
341 | o changeset: 1:ef3a871183d7 |
|
341 | o changeset: 1:ef3a871183d7 | |
342 | | user: test |
|
342 | | user: test | |
343 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
343 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
344 | | summary: b |
|
344 | | summary: b | |
345 | | |
|
345 | | | |
346 | o changeset: 0:9ab35a2d17cb |
|
346 | o changeset: 0:9ab35a2d17cb | |
347 | user: test |
|
347 | user: test | |
348 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
348 | date: Thu Jan 01 00:00:00 1970 +0000 | |
349 | summary: a |
|
349 | summary: a | |
350 |
|
350 | |||
351 |
|
351 | |||
352 | 2 is parent of 3, only one strip should happen |
|
352 | 2 is parent of 3, only one strip should happen | |
353 |
|
353 | |||
354 | $ hg strip "roots(2)" 3 |
|
354 | $ hg strip "roots(2)" 3 | |
355 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
355 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
356 | $ hg log -G |
|
356 | $ hg log -G | |
357 | @ changeset: 2:264128213d29 |
|
357 | @ changeset: 2:264128213d29 | |
358 | | tag: tip |
|
358 | | tag: tip | |
359 | | user: test |
|
359 | | user: test | |
360 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
360 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
361 | | summary: c |
|
361 | | summary: c | |
362 | | |
|
362 | | | |
363 | o changeset: 1:ef3a871183d7 |
|
363 | o changeset: 1:ef3a871183d7 | |
364 | | user: test |
|
364 | | user: test | |
365 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
365 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
366 | | summary: b |
|
366 | | summary: b | |
367 | | |
|
367 | | | |
368 | o changeset: 0:9ab35a2d17cb |
|
368 | o changeset: 0:9ab35a2d17cb | |
369 | user: test |
|
369 | user: test | |
370 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
370 | date: Thu Jan 01 00:00:00 1970 +0000 | |
371 | summary: a |
|
371 | summary: a | |
372 |
|
372 | |||
373 | $ restore |
|
373 | $ restore | |
374 | $ hg log -G |
|
374 | $ hg log -G | |
375 | o changeset: 4:443431ffac4f |
|
375 | o changeset: 4:443431ffac4f | |
376 | | tag: tip |
|
376 | | tag: tip | |
377 | | user: test |
|
377 | | user: test | |
378 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
378 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
379 | | summary: e |
|
379 | | summary: e | |
380 | | |
|
380 | | | |
381 | o changeset: 3:65bd5f99a4a3 |
|
381 | o changeset: 3:65bd5f99a4a3 | |
382 | | parent: 1:ef3a871183d7 |
|
382 | | parent: 1:ef3a871183d7 | |
383 | | user: test |
|
383 | | user: test | |
384 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
384 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
385 | | summary: d |
|
385 | | summary: d | |
386 | | |
|
386 | | | |
387 | | @ changeset: 2:264128213d29 |
|
387 | | @ changeset: 2:264128213d29 | |
388 | |/ user: test |
|
388 | |/ user: test | |
389 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
389 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
390 | | summary: c |
|
390 | | summary: c | |
391 | | |
|
391 | | | |
392 | o changeset: 1:ef3a871183d7 |
|
392 | o changeset: 1:ef3a871183d7 | |
393 | | user: test |
|
393 | | user: test | |
394 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
394 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
395 | | summary: b |
|
395 | | summary: b | |
396 | | |
|
396 | | | |
397 | o changeset: 0:9ab35a2d17cb |
|
397 | o changeset: 0:9ab35a2d17cb | |
398 | user: test |
|
398 | user: test | |
399 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
399 | date: Thu Jan 01 00:00:00 1970 +0000 | |
400 | summary: a |
|
400 | summary: a | |
401 |
|
401 | |||
402 |
|
402 | |||
403 | 2 different branches: 2 strips |
|
403 | 2 different branches: 2 strips | |
404 |
|
404 | |||
405 | $ hg strip 2 4 |
|
405 | $ hg strip 2 4 | |
406 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
406 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
407 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
407 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
408 | $ hg log -G |
|
408 | $ hg log -G | |
409 | o changeset: 2:65bd5f99a4a3 |
|
409 | o changeset: 2:65bd5f99a4a3 | |
410 | | tag: tip |
|
410 | | tag: tip | |
411 | | user: test |
|
411 | | user: test | |
412 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
412 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
413 | | summary: d |
|
413 | | summary: d | |
414 | | |
|
414 | | | |
415 | @ changeset: 1:ef3a871183d7 |
|
415 | @ changeset: 1:ef3a871183d7 | |
416 | | user: test |
|
416 | | user: test | |
417 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
417 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
418 | | summary: b |
|
418 | | summary: b | |
419 | | |
|
419 | | | |
420 | o changeset: 0:9ab35a2d17cb |
|
420 | o changeset: 0:9ab35a2d17cb | |
421 | user: test |
|
421 | user: test | |
422 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
422 | date: Thu Jan 01 00:00:00 1970 +0000 | |
423 | summary: a |
|
423 | summary: a | |
424 |
|
424 | |||
425 | $ restore |
|
425 | $ restore | |
426 |
|
426 | |||
427 | 2 different branches and a common ancestor: 1 strip |
|
427 | 2 different branches and a common ancestor: 1 strip | |
428 |
|
428 | |||
429 | $ hg strip 1 "2|4" |
|
429 | $ hg strip 1 "2|4" | |
430 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
430 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
431 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
431 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
432 | $ restore |
|
432 | $ restore | |
433 |
|
433 | |||
434 | verify fncache is kept up-to-date |
|
434 | verify fncache is kept up-to-date | |
435 |
|
435 | |||
436 | $ touch a |
|
436 | $ touch a | |
437 | $ hg ci -qAm a |
|
437 | $ hg ci -qAm a | |
438 | $ cat .hg/store/fncache | sort |
|
438 | $ cat .hg/store/fncache | sort | |
439 | data/a.i |
|
439 | data/a.i | |
440 | data/bar.i |
|
440 | data/bar.i | |
441 | $ hg strip tip |
|
441 | $ hg strip tip | |
442 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
442 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
443 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
443 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
444 | $ cat .hg/store/fncache |
|
444 | $ cat .hg/store/fncache | |
445 | data/bar.i |
|
445 | data/bar.i | |
446 |
|
446 | |||
447 | stripping an empty revset |
|
447 | stripping an empty revset | |
448 |
|
448 | |||
449 | $ hg strip "1 and not 1" |
|
449 | $ hg strip "1 and not 1" | |
450 | abort: empty revision set |
|
450 | abort: empty revision set | |
451 | [255] |
|
451 | [255] | |
452 |
|
452 | |||
453 | remove branchy history for qimport tests |
|
453 | remove branchy history for qimport tests | |
454 |
|
454 | |||
455 | $ hg strip 3 |
|
455 | $ hg strip 3 | |
456 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
456 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
457 |
|
457 | |||
458 |
|
458 | |||
459 | strip of applied mq should cleanup status file |
|
459 | strip of applied mq should cleanup status file | |
460 |
|
460 | |||
461 | $ echo "mq=" >> $HGRCPATH |
|
461 | $ echo "mq=" >> $HGRCPATH | |
462 | $ hg up -C 3 |
|
462 | $ hg up -C 3 | |
463 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
463 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
464 | $ echo fooagain >> bar |
|
464 | $ echo fooagain >> bar | |
465 | $ hg ci -mf |
|
465 | $ hg ci -mf | |
466 | $ hg qimport -r tip:2 |
|
466 | $ hg qimport -r tip:2 | |
467 |
|
467 | |||
468 | applied patches before strip |
|
468 | applied patches before strip | |
469 |
|
469 | |||
470 | $ hg qapplied |
|
470 | $ hg qapplied | |
471 | 2.diff |
|
471 | 2.diff | |
472 | 3.diff |
|
472 | 3.diff | |
473 | 4.diff |
|
473 | 4.diff | |
474 |
|
474 | |||
475 | stripping revision in queue |
|
475 | stripping revision in queue | |
476 |
|
476 | |||
477 | $ hg strip 3 |
|
477 | $ hg strip 3 | |
478 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
478 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
479 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
479 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
480 |
|
480 | |||
481 | applied patches after stripping rev in queue |
|
481 | applied patches after stripping rev in queue | |
482 |
|
482 | |||
483 | $ hg qapplied |
|
483 | $ hg qapplied | |
484 | 2.diff |
|
484 | 2.diff | |
485 |
|
485 | |||
486 | stripping ancestor of queue |
|
486 | stripping ancestor of queue | |
487 |
|
487 | |||
488 | $ hg strip 1 |
|
488 | $ hg strip 1 | |
489 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
489 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
490 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
490 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
491 |
|
491 | |||
492 | applied patches after stripping ancestor of queue |
|
492 | applied patches after stripping ancestor of queue | |
493 |
|
493 | |||
494 | $ hg qapplied |
|
494 | $ hg qapplied | |
495 |
|
495 | |||
496 | Verify strip protects against stripping wc parent when there are uncommitted mods |
|
496 | Verify strip protects against stripping wc parent when there are uncommitted mods | |
497 |
|
497 | |||
498 | $ echo b > b |
|
498 | $ echo b > b | |
499 | $ echo bb > bar |
|
499 | $ echo bb > bar | |
500 | $ hg add b |
|
500 | $ hg add b | |
501 | $ hg ci -m 'b' |
|
501 | $ hg ci -m 'b' | |
502 | $ hg log --graph |
|
502 | $ hg log --graph | |
503 | @ changeset: 1:76dcf9fab855 |
|
503 | @ changeset: 1:76dcf9fab855 | |
504 | | tag: tip |
|
504 | | tag: tip | |
505 | | user: test |
|
505 | | user: test | |
506 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
506 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
507 | | summary: b |
|
507 | | summary: b | |
508 | | |
|
508 | | | |
509 | o changeset: 0:9ab35a2d17cb |
|
509 | o changeset: 0:9ab35a2d17cb | |
510 | user: test |
|
510 | user: test | |
511 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
511 | date: Thu Jan 01 00:00:00 1970 +0000 | |
512 | summary: a |
|
512 | summary: a | |
513 |
|
513 | |||
514 | $ hg up 0 |
|
514 | $ hg up 0 | |
515 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
515 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
516 | $ echo c > bar |
|
516 | $ echo c > bar | |
517 | $ hg up -t false |
|
517 | $ hg up -t false | |
518 | merging bar |
|
518 | merging bar | |
519 | merging bar failed! |
|
519 | merging bar failed! | |
520 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
520 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
521 | use 'hg resolve' to retry unresolved file merges |
|
521 | use 'hg resolve' to retry unresolved file merges | |
522 | [1] |
|
522 | [1] | |
523 | $ hg sum |
|
523 | $ hg sum | |
524 | parent: 1:76dcf9fab855 tip |
|
524 | parent: 1:76dcf9fab855 tip | |
525 | b |
|
525 | b | |
526 | branch: default |
|
526 | branch: default | |
527 | commit: 1 modified, 1 unknown, 1 unresolved |
|
527 | commit: 1 modified, 1 unknown, 1 unresolved | |
528 | update: (current) |
|
528 | update: (current) | |
529 | phases: 2 draft |
|
529 | phases: 2 draft | |
530 | mq: 3 unapplied |
|
530 | mq: 3 unapplied | |
531 |
|
531 | |||
532 | $ echo c > b |
|
532 | $ echo c > b | |
533 | $ hg strip tip |
|
533 | $ hg strip tip | |
534 | abort: local changes found |
|
534 | abort: local changes found | |
535 | [255] |
|
535 | [255] | |
536 | $ hg strip tip --keep |
|
536 | $ hg strip tip --keep | |
537 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
537 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
538 | $ hg log --graph |
|
538 | $ hg log --graph | |
539 | @ changeset: 0:9ab35a2d17cb |
|
539 | @ changeset: 0:9ab35a2d17cb | |
540 | tag: tip |
|
540 | tag: tip | |
541 | user: test |
|
541 | user: test | |
542 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
542 | date: Thu Jan 01 00:00:00 1970 +0000 | |
543 | summary: a |
|
543 | summary: a | |
544 |
|
544 | |||
545 | $ hg status |
|
545 | $ hg status | |
546 | M bar |
|
546 | M bar | |
547 | ? b |
|
547 | ? b | |
548 | ? bar.orig |
|
548 | ? bar.orig | |
549 |
|
549 | |||
550 | $ rm bar.orig |
|
550 | $ rm bar.orig | |
551 | $ hg sum |
|
551 | $ hg sum | |
552 | parent: 0:9ab35a2d17cb tip |
|
552 | parent: 0:9ab35a2d17cb tip | |
553 | a |
|
553 | a | |
554 | branch: default |
|
554 | branch: default | |
555 | commit: 1 modified, 1 unknown |
|
555 | commit: 1 modified, 1 unknown | |
556 | update: (current) |
|
556 | update: (current) | |
557 | phases: 1 draft |
|
557 | phases: 1 draft | |
558 | mq: 3 unapplied |
|
558 | mq: 3 unapplied | |
559 |
|
559 | |||
560 | Strip adds, removes, modifies with --keep |
|
560 | Strip adds, removes, modifies with --keep | |
561 |
|
561 | |||
562 | $ touch b |
|
562 | $ touch b | |
563 | $ hg add b |
|
563 | $ hg add b | |
564 | $ hg commit -mb |
|
564 | $ hg commit -mb | |
565 | $ touch c |
|
565 | $ touch c | |
566 |
|
566 | |||
567 | ... with a clean working dir |
|
567 | ... with a clean working dir | |
568 |
|
568 | |||
569 | $ hg add c |
|
569 | $ hg add c | |
570 | $ hg rm bar |
|
570 | $ hg rm bar | |
571 | $ hg commit -mc |
|
571 | $ hg commit -mc | |
572 | $ hg status |
|
572 | $ hg status | |
573 | $ hg strip --keep tip |
|
573 | $ hg strip --keep tip | |
574 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
574 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
575 | $ hg status |
|
575 | $ hg status | |
576 | ! bar |
|
576 | ! bar | |
577 | ? c |
|
577 | ? c | |
578 |
|
578 | |||
579 | ... with a dirty working dir |
|
579 | ... with a dirty working dir | |
580 |
|
580 | |||
581 | $ hg add c |
|
581 | $ hg add c | |
582 | $ hg rm bar |
|
582 | $ hg rm bar | |
583 | $ hg commit -mc |
|
583 | $ hg commit -mc | |
584 | $ hg status |
|
584 | $ hg status | |
585 | $ echo b > b |
|
585 | $ echo b > b | |
586 | $ echo d > d |
|
586 | $ echo d > d | |
587 | $ hg strip --keep tip |
|
587 | $ hg strip --keep tip | |
588 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/57e364c8a475-4cfed93c-backup.hg (glob) |
|
588 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/57e364c8a475-4cfed93c-backup.hg (glob) | |
589 | $ hg status |
|
589 | $ hg status | |
590 | M b |
|
590 | M b | |
591 | ! bar |
|
591 | ! bar | |
592 | ? c |
|
592 | ? c | |
593 | ? d |
|
593 | ? d | |
594 | $ cd .. |
|
594 | $ cd .. | |
595 |
|
595 | |||
596 | stripping many nodes on a complex graph (issue3299) |
|
596 | stripping many nodes on a complex graph (issue3299) | |
597 |
|
597 | |||
598 | $ hg init issue3299 |
|
598 | $ hg init issue3299 | |
599 | $ cd issue3299 |
|
599 | $ cd issue3299 | |
600 | $ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a' |
|
600 | $ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a' | |
601 | $ hg strip 'not ancestors(x)' |
|
601 | $ hg strip 'not ancestors(x)' | |
602 | saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob) |
|
602 | saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob) | |
603 |
|
603 | |||
604 | test hg strip -B bookmark |
|
604 | test hg strip -B bookmark | |
605 |
|
605 | |||
606 | $ cd .. |
|
606 | $ cd .. | |
607 | $ hg init bookmarks |
|
607 | $ hg init bookmarks | |
608 | $ cd bookmarks |
|
608 | $ cd bookmarks | |
609 | $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b' |
|
609 | $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b' | |
610 | $ hg bookmark -r 'a' 'todelete' |
|
610 | $ hg bookmark -r 'a' 'todelete' | |
611 | $ hg bookmark -r 'b' 'B' |
|
611 | $ hg bookmark -r 'b' 'B' | |
612 | $ hg bookmark -r 'b' 'nostrip' |
|
612 | $ hg bookmark -r 'b' 'nostrip' | |
613 | $ hg bookmark -r 'c' 'delete' |
|
613 | $ hg bookmark -r 'c' 'delete' | |
614 | $ hg up -C todelete |
|
614 | $ hg up -C todelete | |
615 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
615 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
616 | (activating bookmark todelete) |
|
616 | (activating bookmark todelete) | |
617 | $ hg strip -B nostrip |
|
617 | $ hg strip -B nostrip | |
618 | bookmark 'nostrip' deleted |
|
618 | bookmark 'nostrip' deleted | |
619 | abort: empty revision set |
|
619 | abort: empty revision set | |
620 | [255] |
|
620 | [255] | |
621 | $ hg strip -B todelete |
|
621 | $ hg strip -B todelete | |
622 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
622 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
623 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) |
|
623 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) | |
624 | bookmark 'todelete' deleted |
|
624 | bookmark 'todelete' deleted | |
625 | $ hg id -ir dcbb326fdec2 |
|
625 | $ hg id -ir dcbb326fdec2 | |
626 | abort: unknown revision 'dcbb326fdec2'! |
|
626 | abort: unknown revision 'dcbb326fdec2'! | |
627 | [255] |
|
627 | [255] | |
628 | $ hg id -ir d62d843c9a01 |
|
628 | $ hg id -ir d62d843c9a01 | |
629 | d62d843c9a01 |
|
629 | d62d843c9a01 | |
630 | $ hg bookmarks |
|
630 | $ hg bookmarks | |
631 | B 9:ff43616e5d0f |
|
631 | B 9:ff43616e5d0f | |
632 | delete 6:2702dd0c91e7 |
|
632 | delete 6:2702dd0c91e7 | |
633 | $ hg strip -B delete |
|
633 | $ hg strip -B delete | |
634 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) |
|
634 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) | |
635 | bookmark 'delete' deleted |
|
635 | bookmark 'delete' deleted | |
636 | $ hg id -ir 6:2702dd0c91e7 |
|
636 | $ hg id -ir 6:2702dd0c91e7 | |
637 | abort: unknown revision '2702dd0c91e7'! |
|
637 | abort: unknown revision '2702dd0c91e7'! | |
638 | [255] |
|
638 | [255] | |
639 | $ hg update B |
|
639 | $ hg update B | |
640 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
640 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
641 | (activating bookmark B) |
|
641 | (activating bookmark B) | |
642 | $ echo a > a |
|
642 | $ echo a > a | |
643 | $ hg add a |
|
643 | $ hg add a | |
644 | $ hg strip -B B |
|
644 | $ hg strip -B B | |
645 | abort: local changes found |
|
645 | abort: local changes found | |
646 | [255] |
|
646 | [255] | |
647 | $ hg bookmarks |
|
647 | $ hg bookmarks | |
648 | * B 6:ff43616e5d0f |
|
648 | * B 6:ff43616e5d0f | |
649 |
|
649 | |||
650 | Make sure no one adds back a -b option: |
|
650 | Make sure no one adds back a -b option: | |
651 |
|
651 | |||
652 | $ hg strip -b tip |
|
652 | $ hg strip -b tip | |
653 | hg strip: option -b not recognized |
|
653 | hg strip: option -b not recognized | |
654 | hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV... |
|
654 | hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV... | |
655 |
|
655 | |||
656 | strip changesets and all their descendants from the repository |
|
656 | strip changesets and all their descendants from the repository | |
657 |
|
657 | |||
658 | (use "hg help -e strip" to show help for the strip extension) |
|
658 | (use "hg help -e strip" to show help for the strip extension) | |
659 |
|
659 | |||
660 | options ([+] can be repeated): |
|
660 | options ([+] can be repeated): | |
661 |
|
661 | |||
662 | -r --rev REV [+] strip specified revision (optional, can specify revisions |
|
662 | -r --rev REV [+] strip specified revision (optional, can specify revisions | |
663 | without this option) |
|
663 | without this option) | |
664 | -f --force force removal of changesets, discard uncommitted changes |
|
664 | -f --force force removal of changesets, discard uncommitted changes | |
665 | (no backup) |
|
665 | (no backup) | |
666 | --no-backup no backups |
|
666 | --no-backup no backups | |
667 | -k --keep do not modify working directory during strip |
|
667 | -k --keep do not modify working directory during strip | |
668 | -B --bookmark VALUE remove revs only reachable from given bookmark |
|
668 | -B --bookmark VALUE remove revs only reachable from given bookmark | |
669 | --mq operate on patch repository |
|
669 | --mq operate on patch repository | |
670 |
|
670 | |||
671 | (use "hg strip -h" to show more help) |
|
671 | (use "hg strip -h" to show more help) | |
672 | [255] |
|
672 | [255] | |
673 |
|
673 | |||
674 | $ cd .. |
|
674 | $ cd .. | |
675 |
|
675 | |||
676 | Verify bundles don't get overwritten: |
|
676 | Verify bundles don't get overwritten: | |
677 |
|
677 | |||
678 | $ hg init doublebundle |
|
678 | $ hg init doublebundle | |
679 | $ cd doublebundle |
|
679 | $ cd doublebundle | |
680 | $ touch a |
|
680 | $ touch a | |
681 | $ hg commit -Aqm a |
|
681 | $ hg commit -Aqm a | |
682 | $ touch b |
|
682 | $ touch b | |
683 | $ hg commit -Aqm b |
|
683 | $ hg commit -Aqm b | |
684 | $ hg strip -r 0 |
|
684 | $ hg strip -r 0 | |
685 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
685 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
686 | saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg (glob) |
|
686 | saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg (glob) | |
687 | $ ls .hg/strip-backup |
|
687 | $ ls .hg/strip-backup | |
688 | 3903775176ed-e68910bd-backup.hg |
|
688 | 3903775176ed-e68910bd-backup.hg | |
689 | $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg |
|
689 | $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg | |
690 | $ hg strip -r 0 |
|
690 | $ hg strip -r 0 | |
691 | saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg (glob) |
|
691 | saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg (glob) | |
692 | $ ls .hg/strip-backup |
|
692 | $ ls .hg/strip-backup | |
693 | 3903775176ed-54390173-backup.hg |
|
693 | 3903775176ed-54390173-backup.hg | |
694 | 3903775176ed-e68910bd-backup.hg |
|
694 | 3903775176ed-e68910bd-backup.hg | |
695 | $ cd .. |
|
695 | $ cd .. | |
696 |
|
696 | |||
697 | Test that we only bundle the stripped changesets (issue4736) |
|
697 | Test that we only bundle the stripped changesets (issue4736) | |
698 | ------------------------------------------------------------ |
|
698 | ------------------------------------------------------------ | |
699 |
|
699 | |||
700 |
initiali |
|
700 | initialization (previous repo is empty anyway) | |
701 |
|
701 | |||
702 | $ hg init issue4736 |
|
702 | $ hg init issue4736 | |
703 | $ cd issue4736 |
|
703 | $ cd issue4736 | |
704 | $ echo a > a |
|
704 | $ echo a > a | |
705 | $ hg add a |
|
705 | $ hg add a | |
706 | $ hg commit -m commitA |
|
706 | $ hg commit -m commitA | |
707 | $ echo b > b |
|
707 | $ echo b > b | |
708 | $ hg add b |
|
708 | $ hg add b | |
709 | $ hg commit -m commitB |
|
709 | $ hg commit -m commitB | |
710 | $ echo c > c |
|
710 | $ echo c > c | |
711 | $ hg add c |
|
711 | $ hg add c | |
712 | $ hg commit -m commitC |
|
712 | $ hg commit -m commitC | |
713 | $ hg up 'desc(commitB)' |
|
713 | $ hg up 'desc(commitB)' | |
714 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
714 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
715 | $ echo d > d |
|
715 | $ echo d > d | |
716 | $ hg add d |
|
716 | $ hg add d | |
717 | $ hg commit -m commitD |
|
717 | $ hg commit -m commitD | |
718 | created new head |
|
718 | created new head | |
719 | $ hg up 'desc(commitC)' |
|
719 | $ hg up 'desc(commitC)' | |
720 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
720 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
721 | $ hg merge 'desc(commitD)' |
|
721 | $ hg merge 'desc(commitD)' | |
722 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
722 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
723 | (branch merge, don't forget to commit) |
|
723 | (branch merge, don't forget to commit) | |
724 | $ hg ci -m 'mergeCD' |
|
724 | $ hg ci -m 'mergeCD' | |
725 | $ hg log -G |
|
725 | $ hg log -G | |
726 | @ changeset: 4:d8db9d137221 |
|
726 | @ changeset: 4:d8db9d137221 | |
727 | |\ tag: tip |
|
727 | |\ tag: tip | |
728 | | | parent: 2:5c51d8d6557d |
|
728 | | | parent: 2:5c51d8d6557d | |
729 | | | parent: 3:6625a5168474 |
|
729 | | | parent: 3:6625a5168474 | |
730 | | | user: test |
|
730 | | | user: test | |
731 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
731 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
732 | | | summary: mergeCD |
|
732 | | | summary: mergeCD | |
733 | | | |
|
733 | | | | |
734 | | o changeset: 3:6625a5168474 |
|
734 | | o changeset: 3:6625a5168474 | |
735 | | | parent: 1:eca11cf91c71 |
|
735 | | | parent: 1:eca11cf91c71 | |
736 | | | user: test |
|
736 | | | user: test | |
737 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
737 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
738 | | | summary: commitD |
|
738 | | | summary: commitD | |
739 | | | |
|
739 | | | | |
740 | o | changeset: 2:5c51d8d6557d |
|
740 | o | changeset: 2:5c51d8d6557d | |
741 | |/ user: test |
|
741 | |/ user: test | |
742 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
742 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
743 | | summary: commitC |
|
743 | | summary: commitC | |
744 | | |
|
744 | | | |
745 | o changeset: 1:eca11cf91c71 |
|
745 | o changeset: 1:eca11cf91c71 | |
746 | | user: test |
|
746 | | user: test | |
747 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
747 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
748 | | summary: commitB |
|
748 | | summary: commitB | |
749 | | |
|
749 | | | |
750 | o changeset: 0:105141ef12d0 |
|
750 | o changeset: 0:105141ef12d0 | |
751 | user: test |
|
751 | user: test | |
752 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
752 | date: Thu Jan 01 00:00:00 1970 +0000 | |
753 | summary: commitA |
|
753 | summary: commitA | |
754 |
|
754 | |||
755 |
|
755 | |||
756 | Check bundle behavior: |
|
756 | Check bundle behavior: | |
757 |
|
757 | |||
758 | $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg |
|
758 | $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg | |
759 | 2 changesets found |
|
759 | 2 changesets found | |
760 | $ hg log -r 'bundle()' -R ../issue4736.hg |
|
760 | $ hg log -r 'bundle()' -R ../issue4736.hg | |
761 | changeset: 3:6625a5168474 |
|
761 | changeset: 3:6625a5168474 | |
762 | parent: 1:eca11cf91c71 |
|
762 | parent: 1:eca11cf91c71 | |
763 | user: test |
|
763 | user: test | |
764 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
764 | date: Thu Jan 01 00:00:00 1970 +0000 | |
765 | summary: commitD |
|
765 | summary: commitD | |
766 |
|
766 | |||
767 | changeset: 4:d8db9d137221 |
|
767 | changeset: 4:d8db9d137221 | |
768 | tag: tip |
|
768 | tag: tip | |
769 | parent: 2:5c51d8d6557d |
|
769 | parent: 2:5c51d8d6557d | |
770 | parent: 3:6625a5168474 |
|
770 | parent: 3:6625a5168474 | |
771 | user: test |
|
771 | user: test | |
772 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
772 | date: Thu Jan 01 00:00:00 1970 +0000 | |
773 | summary: mergeCD |
|
773 | summary: mergeCD | |
774 |
|
774 | |||
775 |
|
775 | |||
776 | check strip behavior |
|
776 | check strip behavior | |
777 |
|
777 | |||
778 | $ hg --config extensions.strip= strip 'desc(commitD)' --debug |
|
778 | $ hg --config extensions.strip= strip 'desc(commitD)' --debug | |
779 | resolving manifests |
|
779 | resolving manifests | |
780 | branchmerge: False, force: True, partial: False |
|
780 | branchmerge: False, force: True, partial: False | |
781 | ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71 |
|
781 | ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71 | |
782 | c: other deleted -> r |
|
782 | c: other deleted -> r | |
783 | removing c |
|
783 | removing c | |
784 | d: other deleted -> r |
|
784 | d: other deleted -> r | |
785 | removing d |
|
785 | removing d | |
786 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
786 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
787 | 2 changesets found |
|
787 | 2 changesets found | |
788 | list of changesets: |
|
788 | list of changesets: | |
789 | 6625a516847449b6f0fa3737b9ba56e9f0f3032c |
|
789 | 6625a516847449b6f0fa3737b9ba56e9f0f3032c | |
790 | d8db9d1372214336d2b5570f20ee468d2c72fa8b |
|
790 | d8db9d1372214336d2b5570f20ee468d2c72fa8b | |
791 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob) |
|
791 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob) | |
792 | invalid branchheads cache (served): tip differs |
|
792 | invalid branchheads cache (served): tip differs | |
793 | truncating cache/rbc-revs-v1 to 24 |
|
793 | truncating cache/rbc-revs-v1 to 24 | |
794 | $ hg log -G |
|
794 | $ hg log -G | |
795 | o changeset: 2:5c51d8d6557d |
|
795 | o changeset: 2:5c51d8d6557d | |
796 | | tag: tip |
|
796 | | tag: tip | |
797 | | user: test |
|
797 | | user: test | |
798 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
798 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
799 | | summary: commitC |
|
799 | | summary: commitC | |
800 | | |
|
800 | | | |
801 | @ changeset: 1:eca11cf91c71 |
|
801 | @ changeset: 1:eca11cf91c71 | |
802 | | user: test |
|
802 | | user: test | |
803 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
803 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
804 | | summary: commitB |
|
804 | | summary: commitB | |
805 | | |
|
805 | | | |
806 | o changeset: 0:105141ef12d0 |
|
806 | o changeset: 0:105141ef12d0 | |
807 | user: test |
|
807 | user: test | |
808 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
808 | date: Thu Jan 01 00:00:00 1970 +0000 | |
809 | summary: commitA |
|
809 | summary: commitA | |
810 |
|
810 | |||
811 |
|
811 | |||
812 | strip backup content |
|
812 | strip backup content | |
813 |
|
813 | |||
814 | $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg |
|
814 | $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg | |
815 | changeset: 3:6625a5168474 |
|
815 | changeset: 3:6625a5168474 | |
816 | parent: 1:eca11cf91c71 |
|
816 | parent: 1:eca11cf91c71 | |
817 | user: test |
|
817 | user: test | |
818 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
818 | date: Thu Jan 01 00:00:00 1970 +0000 | |
819 | summary: commitD |
|
819 | summary: commitD | |
820 |
|
820 | |||
821 | changeset: 4:d8db9d137221 |
|
821 | changeset: 4:d8db9d137221 | |
822 | tag: tip |
|
822 | tag: tip | |
823 | parent: 2:5c51d8d6557d |
|
823 | parent: 2:5c51d8d6557d | |
824 | parent: 3:6625a5168474 |
|
824 | parent: 3:6625a5168474 | |
825 | user: test |
|
825 | user: test | |
826 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
826 | date: Thu Jan 01 00:00:00 1970 +0000 | |
827 | summary: mergeCD |
|
827 | summary: mergeCD | |
828 |
|
828 | |||
829 |
|
829 | |||
830 | Error during post-close callback of the strip transaction |
|
830 | Error during post-close callback of the strip transaction | |
831 | (They should be gracefully handled and reported) |
|
831 | (They should be gracefully handled and reported) | |
832 |
|
832 | |||
833 | $ cat > ../crashstrip.py << EOF |
|
833 | $ cat > ../crashstrip.py << EOF | |
834 | > from mercurial import error |
|
834 | > from mercurial import error | |
835 | > def reposetup(ui, repo): |
|
835 | > def reposetup(ui, repo): | |
836 | > class crashstriprepo(repo.__class__): |
|
836 | > class crashstriprepo(repo.__class__): | |
837 | > def transaction(self, desc, *args, **kwargs): |
|
837 | > def transaction(self, desc, *args, **kwargs): | |
838 | > tr = super(crashstriprepo, self).transaction(self, desc, *args, **kwargs) |
|
838 | > tr = super(crashstriprepo, self).transaction(self, desc, *args, **kwargs) | |
839 | > if desc == 'strip': |
|
839 | > if desc == 'strip': | |
840 | > def crash(tra): raise error.Abort('boom') |
|
840 | > def crash(tra): raise error.Abort('boom') | |
841 | > tr.addpostclose('crash', crash) |
|
841 | > tr.addpostclose('crash', crash) | |
842 | > return tr |
|
842 | > return tr | |
843 | > repo.__class__ = crashstriprepo |
|
843 | > repo.__class__ = crashstriprepo | |
844 | > EOF |
|
844 | > EOF | |
845 | $ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py |
|
845 | $ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py | |
846 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg (glob) |
|
846 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg (glob) | |
847 | strip failed, full bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg' |
|
847 | strip failed, full bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg' | |
848 | abort: boom |
|
848 | abort: boom | |
849 | [255] |
|
849 | [255] | |
850 |
|
850 | |||
851 |
|
851 |
General Comments 0
You need to be logged in to leave comments.
Login now