Show More
@@ -1,1122 +1,1128 b'' | |||||
1 | $ echo "[format]" >> $HGRCPATH |
|
1 | $ echo "[format]" >> $HGRCPATH | |
2 | $ echo "usegeneraldelta=yes" >> $HGRCPATH |
|
2 | $ echo "usegeneraldelta=yes" >> $HGRCPATH | |
3 | $ echo "[extensions]" >> $HGRCPATH |
|
3 | $ echo "[extensions]" >> $HGRCPATH | |
4 | $ echo "strip=" >> $HGRCPATH |
|
4 | $ echo "strip=" >> $HGRCPATH | |
5 | $ echo "drawdag=$TESTDIR/drawdag.py" >> $HGRCPATH |
|
5 | $ echo "drawdag=$TESTDIR/drawdag.py" >> $HGRCPATH | |
6 |
|
6 | |||
7 | $ restore() { |
|
7 | $ restore() { | |
8 | > hg unbundle -q .hg/strip-backup/* |
|
8 | > hg unbundle -q .hg/strip-backup/* | |
9 | > rm .hg/strip-backup/* |
|
9 | > rm .hg/strip-backup/* | |
10 | > } |
|
10 | > } | |
11 | $ teststrip() { |
|
11 | $ teststrip() { | |
12 | > hg up -C $1 |
|
12 | > hg up -C $1 | |
13 | > echo % before update $1, strip $2 |
|
13 | > echo % before update $1, strip $2 | |
14 | > hg parents |
|
14 | > hg parents | |
15 | > hg --traceback strip $2 |
|
15 | > hg --traceback strip $2 | |
16 | > echo % after update $1, strip $2 |
|
16 | > echo % after update $1, strip $2 | |
17 | > hg parents |
|
17 | > hg parents | |
18 | > restore |
|
18 | > restore | |
19 | > } |
|
19 | > } | |
20 |
|
20 | |||
21 | $ hg init test |
|
21 | $ hg init test | |
22 | $ cd test |
|
22 | $ cd test | |
23 |
|
23 | |||
24 | $ echo foo > bar |
|
24 | $ echo foo > bar | |
25 | $ hg ci -Ama |
|
25 | $ hg ci -Ama | |
26 | adding bar |
|
26 | adding bar | |
27 |
|
27 | |||
28 | $ echo more >> bar |
|
28 | $ echo more >> bar | |
29 | $ hg ci -Amb |
|
29 | $ hg ci -Amb | |
30 |
|
30 | |||
31 | $ echo blah >> bar |
|
31 | $ echo blah >> bar | |
32 | $ hg ci -Amc |
|
32 | $ hg ci -Amc | |
33 |
|
33 | |||
34 | $ hg up 1 |
|
34 | $ hg up 1 | |
35 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
35 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
36 | $ echo blah >> bar |
|
36 | $ echo blah >> bar | |
37 | $ hg ci -Amd |
|
37 | $ hg ci -Amd | |
38 | created new head |
|
38 | created new head | |
39 |
|
39 | |||
40 | $ echo final >> bar |
|
40 | $ echo final >> bar | |
41 | $ hg ci -Ame |
|
41 | $ hg ci -Ame | |
42 |
|
42 | |||
43 | $ hg log |
|
43 | $ hg log | |
44 | changeset: 4:443431ffac4f |
|
44 | changeset: 4:443431ffac4f | |
45 | tag: tip |
|
45 | tag: tip | |
46 | user: test |
|
46 | user: test | |
47 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
47 | date: Thu Jan 01 00:00:00 1970 +0000 | |
48 | summary: e |
|
48 | summary: e | |
49 |
|
49 | |||
50 | changeset: 3:65bd5f99a4a3 |
|
50 | changeset: 3:65bd5f99a4a3 | |
51 | parent: 1:ef3a871183d7 |
|
51 | parent: 1:ef3a871183d7 | |
52 | user: test |
|
52 | user: test | |
53 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
53 | date: Thu Jan 01 00:00:00 1970 +0000 | |
54 | summary: d |
|
54 | summary: d | |
55 |
|
55 | |||
56 | changeset: 2:264128213d29 |
|
56 | changeset: 2:264128213d29 | |
57 | user: test |
|
57 | user: test | |
58 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
58 | date: Thu Jan 01 00:00:00 1970 +0000 | |
59 | summary: c |
|
59 | summary: c | |
60 |
|
60 | |||
61 | changeset: 1:ef3a871183d7 |
|
61 | changeset: 1:ef3a871183d7 | |
62 | user: test |
|
62 | user: test | |
63 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
63 | date: Thu Jan 01 00:00:00 1970 +0000 | |
64 | summary: b |
|
64 | summary: b | |
65 |
|
65 | |||
66 | changeset: 0:9ab35a2d17cb |
|
66 | changeset: 0:9ab35a2d17cb | |
67 | user: test |
|
67 | user: test | |
68 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
68 | date: Thu Jan 01 00:00:00 1970 +0000 | |
69 | summary: a |
|
69 | summary: a | |
70 |
|
70 | |||
71 |
|
71 | |||
72 | $ teststrip 4 4 |
|
72 | $ teststrip 4 4 | |
73 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
73 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
74 | % before update 4, strip 4 |
|
74 | % before update 4, strip 4 | |
75 | changeset: 4:443431ffac4f |
|
75 | changeset: 4:443431ffac4f | |
76 | tag: tip |
|
76 | tag: tip | |
77 | user: test |
|
77 | user: test | |
78 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
78 | date: Thu Jan 01 00:00:00 1970 +0000 | |
79 | summary: e |
|
79 | summary: e | |
80 |
|
80 | |||
81 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
81 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
82 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
82 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
83 | % after update 4, strip 4 |
|
83 | % after update 4, strip 4 | |
84 | changeset: 3:65bd5f99a4a3 |
|
84 | changeset: 3:65bd5f99a4a3 | |
85 | tag: tip |
|
85 | tag: tip | |
86 | parent: 1:ef3a871183d7 |
|
86 | parent: 1:ef3a871183d7 | |
87 | user: test |
|
87 | user: test | |
88 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
88 | date: Thu Jan 01 00:00:00 1970 +0000 | |
89 | summary: d |
|
89 | summary: d | |
90 |
|
90 | |||
91 | $ teststrip 4 3 |
|
91 | $ teststrip 4 3 | |
92 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
92 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
93 | % before update 4, strip 3 |
|
93 | % before update 4, strip 3 | |
94 | changeset: 4:443431ffac4f |
|
94 | changeset: 4:443431ffac4f | |
95 | tag: tip |
|
95 | tag: tip | |
96 | user: test |
|
96 | user: test | |
97 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
97 | date: Thu Jan 01 00:00:00 1970 +0000 | |
98 | summary: e |
|
98 | summary: e | |
99 |
|
99 | |||
100 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
100 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
101 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
101 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
102 | % after update 4, strip 3 |
|
102 | % after update 4, strip 3 | |
103 | changeset: 1:ef3a871183d7 |
|
103 | changeset: 1:ef3a871183d7 | |
104 | user: test |
|
104 | user: test | |
105 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
105 | date: Thu Jan 01 00:00:00 1970 +0000 | |
106 | summary: b |
|
106 | summary: b | |
107 |
|
107 | |||
108 | $ teststrip 1 4 |
|
108 | $ teststrip 1 4 | |
109 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
109 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
110 | % before update 1, strip 4 |
|
110 | % before update 1, strip 4 | |
111 | changeset: 1:ef3a871183d7 |
|
111 | changeset: 1:ef3a871183d7 | |
112 | user: test |
|
112 | user: test | |
113 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
113 | date: Thu Jan 01 00:00:00 1970 +0000 | |
114 | summary: b |
|
114 | summary: b | |
115 |
|
115 | |||
116 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
116 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
117 | % after update 1, strip 4 |
|
117 | % after update 1, strip 4 | |
118 | changeset: 1:ef3a871183d7 |
|
118 | changeset: 1:ef3a871183d7 | |
119 | user: test |
|
119 | user: test | |
120 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
120 | date: Thu Jan 01 00:00:00 1970 +0000 | |
121 | summary: b |
|
121 | summary: b | |
122 |
|
122 | |||
123 | $ teststrip 4 2 |
|
123 | $ teststrip 4 2 | |
124 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
124 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
125 | % before update 4, strip 2 |
|
125 | % before update 4, strip 2 | |
126 | changeset: 4:443431ffac4f |
|
126 | changeset: 4:443431ffac4f | |
127 | tag: tip |
|
127 | tag: tip | |
128 | user: test |
|
128 | user: test | |
129 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
129 | date: Thu Jan 01 00:00:00 1970 +0000 | |
130 | summary: e |
|
130 | summary: e | |
131 |
|
131 | |||
132 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
132 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
133 | % after update 4, strip 2 |
|
133 | % after update 4, strip 2 | |
134 | changeset: 3:443431ffac4f |
|
134 | changeset: 3:443431ffac4f | |
135 | tag: tip |
|
135 | tag: tip | |
136 | user: test |
|
136 | user: test | |
137 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
137 | date: Thu Jan 01 00:00:00 1970 +0000 | |
138 | summary: e |
|
138 | summary: e | |
139 |
|
139 | |||
140 | $ teststrip 4 1 |
|
140 | $ teststrip 4 1 | |
141 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
141 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
142 | % before update 4, strip 1 |
|
142 | % before update 4, strip 1 | |
143 | changeset: 4:264128213d29 |
|
143 | changeset: 4:264128213d29 | |
144 | tag: tip |
|
144 | tag: tip | |
145 | parent: 1:ef3a871183d7 |
|
145 | parent: 1:ef3a871183d7 | |
146 | user: test |
|
146 | user: test | |
147 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
147 | date: Thu Jan 01 00:00:00 1970 +0000 | |
148 | summary: c |
|
148 | summary: c | |
149 |
|
149 | |||
150 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
150 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
151 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
151 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
152 | % after update 4, strip 1 |
|
152 | % after update 4, strip 1 | |
153 | changeset: 0:9ab35a2d17cb |
|
153 | changeset: 0:9ab35a2d17cb | |
154 | tag: tip |
|
154 | tag: tip | |
155 | user: test |
|
155 | user: test | |
156 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
156 | date: Thu Jan 01 00:00:00 1970 +0000 | |
157 | summary: a |
|
157 | summary: a | |
158 |
|
158 | |||
159 | $ teststrip null 4 |
|
159 | $ teststrip null 4 | |
160 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
160 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
161 | % before update null, strip 4 |
|
161 | % before update null, strip 4 | |
162 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
162 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
163 | % after update null, strip 4 |
|
163 | % after update null, strip 4 | |
164 |
|
164 | |||
165 | $ hg log |
|
165 | $ hg log | |
166 | changeset: 4:264128213d29 |
|
166 | changeset: 4:264128213d29 | |
167 | tag: tip |
|
167 | tag: tip | |
168 | parent: 1:ef3a871183d7 |
|
168 | parent: 1:ef3a871183d7 | |
169 | user: test |
|
169 | user: test | |
170 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
170 | date: Thu Jan 01 00:00:00 1970 +0000 | |
171 | summary: c |
|
171 | summary: c | |
172 |
|
172 | |||
173 | changeset: 3:443431ffac4f |
|
173 | changeset: 3:443431ffac4f | |
174 | user: test |
|
174 | user: test | |
175 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
175 | date: Thu Jan 01 00:00:00 1970 +0000 | |
176 | summary: e |
|
176 | summary: e | |
177 |
|
177 | |||
178 | changeset: 2:65bd5f99a4a3 |
|
178 | changeset: 2:65bd5f99a4a3 | |
179 | user: test |
|
179 | user: test | |
180 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
180 | date: Thu Jan 01 00:00:00 1970 +0000 | |
181 | summary: d |
|
181 | summary: d | |
182 |
|
182 | |||
183 | changeset: 1:ef3a871183d7 |
|
183 | changeset: 1:ef3a871183d7 | |
184 | user: test |
|
184 | user: test | |
185 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
185 | date: Thu Jan 01 00:00:00 1970 +0000 | |
186 | summary: b |
|
186 | summary: b | |
187 |
|
187 | |||
188 | changeset: 0:9ab35a2d17cb |
|
188 | changeset: 0:9ab35a2d17cb | |
189 | user: test |
|
189 | user: test | |
190 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
190 | date: Thu Jan 01 00:00:00 1970 +0000 | |
191 | summary: a |
|
191 | summary: a | |
192 |
|
192 | |||
193 | $ hg up -C 4 |
|
193 | $ hg up -C 4 | |
194 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
194 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
195 | $ hg parents |
|
195 | $ hg parents | |
196 | changeset: 4:264128213d29 |
|
196 | changeset: 4:264128213d29 | |
197 | tag: tip |
|
197 | tag: tip | |
198 | parent: 1:ef3a871183d7 |
|
198 | parent: 1:ef3a871183d7 | |
199 | user: test |
|
199 | user: test | |
200 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
200 | date: Thu Jan 01 00:00:00 1970 +0000 | |
201 | summary: c |
|
201 | summary: c | |
202 |
|
202 | |||
203 |
|
203 | |||
204 | $ hg --traceback strip 4 |
|
204 | $ hg --traceback strip 4 | |
205 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
205 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
206 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob) |
|
206 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob) | |
207 | $ hg parents |
|
207 | $ hg parents | |
208 | changeset: 1:ef3a871183d7 |
|
208 | changeset: 1:ef3a871183d7 | |
209 | user: test |
|
209 | user: test | |
210 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
210 | date: Thu Jan 01 00:00:00 1970 +0000 | |
211 | summary: b |
|
211 | summary: b | |
212 |
|
212 | |||
213 | $ hg debugbundle .hg/strip-backup/* |
|
213 | $ hg debugbundle .hg/strip-backup/* | |
214 | Stream params: {Compression: BZ} |
|
214 | Stream params: {Compression: BZ} | |
215 | changegroup -- {nbchanges: 1, version: 02} |
|
215 | changegroup -- {nbchanges: 1, version: 02} | |
216 | 264128213d290d868c54642d13aeaa3675551a78 |
|
216 | 264128213d290d868c54642d13aeaa3675551a78 | |
217 | phase-heads -- {} |
|
217 | phase-heads -- {} | |
218 | 264128213d290d868c54642d13aeaa3675551a78 draft |
|
218 | 264128213d290d868c54642d13aeaa3675551a78 draft | |
219 | $ hg pull .hg/strip-backup/* |
|
219 | $ hg pull .hg/strip-backup/* | |
220 | pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg |
|
220 | pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg | |
221 | searching for changes |
|
221 | searching for changes | |
222 | adding changesets |
|
222 | adding changesets | |
223 | adding manifests |
|
223 | adding manifests | |
224 | adding file changes |
|
224 | adding file changes | |
225 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
225 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
226 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
226 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
227 | $ rm .hg/strip-backup/* |
|
227 | $ rm .hg/strip-backup/* | |
228 | $ hg log --graph |
|
228 | $ hg log --graph | |
229 | o changeset: 4:264128213d29 |
|
229 | o changeset: 4:264128213d29 | |
230 | | tag: tip |
|
230 | | tag: tip | |
231 | | parent: 1:ef3a871183d7 |
|
231 | | parent: 1:ef3a871183d7 | |
232 | | user: test |
|
232 | | user: test | |
233 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
233 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
234 | | summary: c |
|
234 | | summary: c | |
235 | | |
|
235 | | | |
236 | | o changeset: 3:443431ffac4f |
|
236 | | o changeset: 3:443431ffac4f | |
237 | | | user: test |
|
237 | | | user: test | |
238 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
238 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
239 | | | summary: e |
|
239 | | | summary: e | |
240 | | | |
|
240 | | | | |
241 | | o changeset: 2:65bd5f99a4a3 |
|
241 | | o changeset: 2:65bd5f99a4a3 | |
242 | |/ user: test |
|
242 | |/ user: test | |
243 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
243 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
244 | | summary: d |
|
244 | | summary: d | |
245 | | |
|
245 | | | |
246 | @ changeset: 1:ef3a871183d7 |
|
246 | @ changeset: 1:ef3a871183d7 | |
247 | | user: test |
|
247 | | user: test | |
248 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
248 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
249 | | summary: b |
|
249 | | summary: b | |
250 | | |
|
250 | | | |
251 | o changeset: 0:9ab35a2d17cb |
|
251 | o changeset: 0:9ab35a2d17cb | |
252 | user: test |
|
252 | user: test | |
253 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
253 | date: Thu Jan 01 00:00:00 1970 +0000 | |
254 | summary: a |
|
254 | summary: a | |
255 |
|
255 | |||
256 | $ hg up -C 2 |
|
256 | $ hg up -C 2 | |
257 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
257 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
258 | $ hg merge 4 |
|
258 | $ hg merge 4 | |
259 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
259 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
260 | (branch merge, don't forget to commit) |
|
260 | (branch merge, don't forget to commit) | |
261 |
|
261 | |||
262 | before strip of merge parent |
|
262 | before strip of merge parent | |
263 |
|
263 | |||
264 | $ hg parents |
|
264 | $ hg parents | |
265 | changeset: 2:65bd5f99a4a3 |
|
265 | changeset: 2:65bd5f99a4a3 | |
266 | user: test |
|
266 | user: test | |
267 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
267 | date: Thu Jan 01 00:00:00 1970 +0000 | |
268 | summary: d |
|
268 | summary: d | |
269 |
|
269 | |||
270 | changeset: 4:264128213d29 |
|
270 | changeset: 4:264128213d29 | |
271 | tag: tip |
|
271 | tag: tip | |
272 | parent: 1:ef3a871183d7 |
|
272 | parent: 1:ef3a871183d7 | |
273 | user: test |
|
273 | user: test | |
274 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
274 | date: Thu Jan 01 00:00:00 1970 +0000 | |
275 | summary: c |
|
275 | summary: c | |
276 |
|
276 | |||
277 | $ hg strip 4 |
|
277 | $ hg strip 4 | |
278 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
278 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
279 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
279 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
280 |
|
280 | |||
281 | after strip of merge parent |
|
281 | after strip of merge parent | |
282 |
|
282 | |||
283 | $ hg parents |
|
283 | $ hg parents | |
284 | changeset: 1:ef3a871183d7 |
|
284 | changeset: 1:ef3a871183d7 | |
285 | user: test |
|
285 | user: test | |
286 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
286 | date: Thu Jan 01 00:00:00 1970 +0000 | |
287 | summary: b |
|
287 | summary: b | |
288 |
|
288 | |||
289 | $ restore |
|
289 | $ restore | |
290 |
|
290 | |||
291 | $ hg up |
|
291 | $ hg up | |
292 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
292 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
293 | updated to "264128213d29: c" |
|
293 | updated to "264128213d29: c" | |
294 | 1 other heads for branch "default" |
|
294 | 1 other heads for branch "default" | |
295 | $ hg log -G |
|
295 | $ hg log -G | |
296 | @ changeset: 4:264128213d29 |
|
296 | @ changeset: 4:264128213d29 | |
297 | | tag: tip |
|
297 | | tag: tip | |
298 | | parent: 1:ef3a871183d7 |
|
298 | | parent: 1:ef3a871183d7 | |
299 | | user: test |
|
299 | | user: test | |
300 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
300 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
301 | | summary: c |
|
301 | | summary: c | |
302 | | |
|
302 | | | |
303 | | o changeset: 3:443431ffac4f |
|
303 | | o changeset: 3:443431ffac4f | |
304 | | | user: test |
|
304 | | | user: test | |
305 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
305 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
306 | | | summary: e |
|
306 | | | summary: e | |
307 | | | |
|
307 | | | | |
308 | | o changeset: 2:65bd5f99a4a3 |
|
308 | | o changeset: 2:65bd5f99a4a3 | |
309 | |/ user: test |
|
309 | |/ user: test | |
310 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
310 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
311 | | summary: d |
|
311 | | summary: d | |
312 | | |
|
312 | | | |
313 | o changeset: 1:ef3a871183d7 |
|
313 | o changeset: 1:ef3a871183d7 | |
314 | | user: test |
|
314 | | user: test | |
315 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
315 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
316 | | summary: b |
|
316 | | summary: b | |
317 | | |
|
317 | | | |
318 | o changeset: 0:9ab35a2d17cb |
|
318 | o changeset: 0:9ab35a2d17cb | |
319 | user: test |
|
319 | user: test | |
320 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
320 | date: Thu Jan 01 00:00:00 1970 +0000 | |
321 | summary: a |
|
321 | summary: a | |
322 |
|
322 | |||
323 |
|
323 | |||
324 | 2 is parent of 3, only one strip should happen |
|
324 | 2 is parent of 3, only one strip should happen | |
325 |
|
325 | |||
326 | $ hg strip "roots(2)" 3 |
|
326 | $ hg strip "roots(2)" 3 | |
327 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
327 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
328 | $ hg log -G |
|
328 | $ hg log -G | |
329 | @ changeset: 2:264128213d29 |
|
329 | @ changeset: 2:264128213d29 | |
330 | | tag: tip |
|
330 | | tag: tip | |
331 | | user: test |
|
331 | | user: test | |
332 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
332 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
333 | | summary: c |
|
333 | | summary: c | |
334 | | |
|
334 | | | |
335 | o changeset: 1:ef3a871183d7 |
|
335 | o changeset: 1:ef3a871183d7 | |
336 | | user: test |
|
336 | | user: test | |
337 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
337 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
338 | | summary: b |
|
338 | | summary: b | |
339 | | |
|
339 | | | |
340 | o changeset: 0:9ab35a2d17cb |
|
340 | o changeset: 0:9ab35a2d17cb | |
341 | user: test |
|
341 | user: test | |
342 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
342 | date: Thu Jan 01 00:00:00 1970 +0000 | |
343 | summary: a |
|
343 | summary: a | |
344 |
|
344 | |||
345 | $ restore |
|
345 | $ restore | |
346 | $ hg log -G |
|
346 | $ hg log -G | |
347 | o changeset: 4:443431ffac4f |
|
347 | o changeset: 4:443431ffac4f | |
348 | | tag: tip |
|
348 | | tag: tip | |
349 | | user: test |
|
349 | | user: test | |
350 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
350 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
351 | | summary: e |
|
351 | | summary: e | |
352 | | |
|
352 | | | |
353 | o changeset: 3:65bd5f99a4a3 |
|
353 | o changeset: 3:65bd5f99a4a3 | |
354 | | parent: 1:ef3a871183d7 |
|
354 | | parent: 1:ef3a871183d7 | |
355 | | user: test |
|
355 | | user: test | |
356 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
356 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
357 | | summary: d |
|
357 | | summary: d | |
358 | | |
|
358 | | | |
359 | | @ changeset: 2:264128213d29 |
|
359 | | @ changeset: 2:264128213d29 | |
360 | |/ user: test |
|
360 | |/ user: test | |
361 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
361 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
362 | | summary: c |
|
362 | | summary: c | |
363 | | |
|
363 | | | |
364 | o changeset: 1:ef3a871183d7 |
|
364 | o changeset: 1:ef3a871183d7 | |
365 | | user: test |
|
365 | | user: test | |
366 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
366 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
367 | | summary: b |
|
367 | | summary: b | |
368 | | |
|
368 | | | |
369 | o changeset: 0:9ab35a2d17cb |
|
369 | o changeset: 0:9ab35a2d17cb | |
370 | user: test |
|
370 | user: test | |
371 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
371 | date: Thu Jan 01 00:00:00 1970 +0000 | |
372 | summary: a |
|
372 | summary: a | |
373 |
|
373 | |||
374 | Failed hook while applying "saveheads" bundle. |
|
374 | Failed hook while applying "saveheads" bundle. | |
375 |
|
375 | |||
376 | $ hg strip 2 --config hooks.pretxnchangegroup.bad=false |
|
376 | $ hg strip 2 --config hooks.pretxnchangegroup.bad=false | |
377 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
377 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
378 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
378 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
379 | transaction abort! |
|
379 | transaction abort! | |
380 | rollback completed |
|
380 | rollback completed | |
381 | strip failed, backup bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob) |
|
381 | strip failed, backup bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob) | |
382 | strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob) |
|
382 | strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob) | |
383 | (fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob) |
|
383 | (fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob) | |
384 | abort: pretxnchangegroup.bad hook exited with status 1 |
|
384 | abort: pretxnchangegroup.bad hook exited with status 1 | |
385 | [255] |
|
385 | [255] | |
386 | $ restore |
|
386 | $ restore | |
387 | $ hg log -G |
|
387 | $ hg log -G | |
388 | o changeset: 4:443431ffac4f |
|
388 | o changeset: 4:443431ffac4f | |
389 | | tag: tip |
|
389 | | tag: tip | |
390 | | user: test |
|
390 | | user: test | |
391 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
391 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
392 | | summary: e |
|
392 | | summary: e | |
393 | | |
|
393 | | | |
394 | o changeset: 3:65bd5f99a4a3 |
|
394 | o changeset: 3:65bd5f99a4a3 | |
395 | | parent: 1:ef3a871183d7 |
|
395 | | parent: 1:ef3a871183d7 | |
396 | | user: test |
|
396 | | user: test | |
397 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
397 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
398 | | summary: d |
|
398 | | summary: d | |
399 | | |
|
399 | | | |
400 | | o changeset: 2:264128213d29 |
|
400 | | o changeset: 2:264128213d29 | |
401 | |/ user: test |
|
401 | |/ user: test | |
402 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
402 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
403 | | summary: c |
|
403 | | summary: c | |
404 | | |
|
404 | | | |
405 | @ changeset: 1:ef3a871183d7 |
|
405 | @ changeset: 1:ef3a871183d7 | |
406 | | user: test |
|
406 | | user: test | |
407 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
407 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
408 | | summary: b |
|
408 | | summary: b | |
409 | | |
|
409 | | | |
410 | o changeset: 0:9ab35a2d17cb |
|
410 | o changeset: 0:9ab35a2d17cb | |
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: a |
|
413 | summary: a | |
414 |
|
414 | |||
415 |
|
415 | |||
416 | 2 different branches: 2 strips |
|
416 | 2 different branches: 2 strips | |
417 |
|
417 | |||
418 | $ hg strip 2 4 |
|
418 | $ hg strip 2 4 | |
419 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
419 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
420 | $ hg log -G |
|
420 | $ hg log -G | |
421 | o changeset: 2:65bd5f99a4a3 |
|
421 | o changeset: 2:65bd5f99a4a3 | |
422 | | tag: tip |
|
422 | | tag: tip | |
423 | | user: test |
|
423 | | user: test | |
424 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
424 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
425 | | summary: d |
|
425 | | summary: d | |
426 | | |
|
426 | | | |
427 | @ changeset: 1:ef3a871183d7 |
|
427 | @ changeset: 1:ef3a871183d7 | |
428 | | user: test |
|
428 | | user: test | |
429 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
429 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
430 | | summary: b |
|
430 | | summary: b | |
431 | | |
|
431 | | | |
432 | o changeset: 0:9ab35a2d17cb |
|
432 | o changeset: 0:9ab35a2d17cb | |
433 | user: test |
|
433 | user: test | |
434 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
434 | date: Thu Jan 01 00:00:00 1970 +0000 | |
435 | summary: a |
|
435 | summary: a | |
436 |
|
436 | |||
437 | $ restore |
|
437 | $ restore | |
438 |
|
438 | |||
439 | 2 different branches and a common ancestor: 1 strip |
|
439 | 2 different branches and a common ancestor: 1 strip | |
440 |
|
440 | |||
441 | $ hg strip 1 "2|4" |
|
441 | $ hg strip 1 "2|4" | |
442 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
442 | 1 files updated, 0 files merged, 0 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 | $ restore |
|
444 | $ restore | |
445 |
|
445 | |||
446 | verify fncache is kept up-to-date |
|
446 | verify fncache is kept up-to-date | |
447 |
|
447 | |||
448 | $ touch a |
|
448 | $ touch a | |
449 | $ hg ci -qAm a |
|
449 | $ hg ci -qAm a | |
450 | $ cat .hg/store/fncache | sort |
|
450 | $ cat .hg/store/fncache | sort | |
451 | data/a.i |
|
451 | data/a.i | |
452 | data/bar.i |
|
452 | data/bar.i | |
453 | $ hg strip tip |
|
453 | $ hg strip tip | |
454 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
454 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
455 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
455 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
456 | $ cat .hg/store/fncache |
|
456 | $ cat .hg/store/fncache | |
457 | data/bar.i |
|
457 | data/bar.i | |
458 |
|
458 | |||
459 | stripping an empty revset |
|
459 | stripping an empty revset | |
460 |
|
460 | |||
461 | $ hg strip "1 and not 1" |
|
461 | $ hg strip "1 and not 1" | |
462 | abort: empty revision set |
|
462 | abort: empty revision set | |
463 | [255] |
|
463 | [255] | |
464 |
|
464 | |||
465 | remove branchy history for qimport tests |
|
465 | remove branchy history for qimport tests | |
466 |
|
466 | |||
467 | $ hg strip 3 |
|
467 | $ hg strip 3 | |
468 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
468 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
469 |
|
469 | |||
470 |
|
470 | |||
471 | strip of applied mq should cleanup status file |
|
471 | strip of applied mq should cleanup status file | |
472 |
|
472 | |||
473 | $ echo "mq=" >> $HGRCPATH |
|
473 | $ echo "mq=" >> $HGRCPATH | |
474 | $ hg up -C 3 |
|
474 | $ hg up -C 3 | |
475 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
475 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
476 | $ echo fooagain >> bar |
|
476 | $ echo fooagain >> bar | |
477 | $ hg ci -mf |
|
477 | $ hg ci -mf | |
478 | $ hg qimport -r tip:2 |
|
478 | $ hg qimport -r tip:2 | |
479 |
|
479 | |||
480 | applied patches before strip |
|
480 | applied patches before strip | |
481 |
|
481 | |||
482 | $ hg qapplied |
|
482 | $ hg qapplied | |
483 | d |
|
483 | d | |
484 | e |
|
484 | e | |
485 | f |
|
485 | f | |
486 |
|
486 | |||
487 | stripping revision in queue |
|
487 | stripping revision in queue | |
488 |
|
488 | |||
489 | $ hg strip 3 |
|
489 | $ hg strip 3 | |
490 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
490 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
491 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
491 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
492 |
|
492 | |||
493 | applied patches after stripping rev in queue |
|
493 | applied patches after stripping rev in queue | |
494 |
|
494 | |||
495 | $ hg qapplied |
|
495 | $ hg qapplied | |
496 | d |
|
496 | d | |
497 |
|
497 | |||
498 | stripping ancestor of queue |
|
498 | stripping ancestor of queue | |
499 |
|
499 | |||
500 | $ hg strip 1 |
|
500 | $ hg strip 1 | |
501 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
501 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
502 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
502 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
503 |
|
503 | |||
504 | applied patches after stripping ancestor of queue |
|
504 | applied patches after stripping ancestor of queue | |
505 |
|
505 | |||
506 | $ hg qapplied |
|
506 | $ hg qapplied | |
507 |
|
507 | |||
508 | Verify strip protects against stripping wc parent when there are uncommitted mods |
|
508 | Verify strip protects against stripping wc parent when there are uncommitted mods | |
509 |
|
509 | |||
510 | $ echo b > b |
|
510 | $ echo b > b | |
511 | $ echo bb > bar |
|
511 | $ echo bb > bar | |
512 | $ hg add b |
|
512 | $ hg add b | |
513 | $ hg ci -m 'b' |
|
513 | $ hg ci -m 'b' | |
514 | $ hg log --graph |
|
514 | $ hg log --graph | |
515 | @ changeset: 1:76dcf9fab855 |
|
515 | @ changeset: 1:76dcf9fab855 | |
516 | | tag: tip |
|
516 | | tag: tip | |
517 | | user: test |
|
517 | | user: test | |
518 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
518 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
519 | | summary: b |
|
519 | | summary: b | |
520 | | |
|
520 | | | |
521 | o changeset: 0:9ab35a2d17cb |
|
521 | o changeset: 0:9ab35a2d17cb | |
522 | user: test |
|
522 | user: test | |
523 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
523 | date: Thu Jan 01 00:00:00 1970 +0000 | |
524 | summary: a |
|
524 | summary: a | |
525 |
|
525 | |||
526 | $ hg up 0 |
|
526 | $ hg up 0 | |
527 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
527 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
528 | $ echo c > bar |
|
528 | $ echo c > bar | |
529 | $ hg up -t false |
|
529 | $ hg up -t false | |
530 | merging bar |
|
530 | merging bar | |
531 | merging bar failed! |
|
531 | merging bar failed! | |
532 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
532 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
533 | use 'hg resolve' to retry unresolved file merges |
|
533 | use 'hg resolve' to retry unresolved file merges | |
534 | [1] |
|
534 | [1] | |
535 | $ hg sum |
|
535 | $ hg sum | |
536 | parent: 1:76dcf9fab855 tip |
|
536 | parent: 1:76dcf9fab855 tip | |
537 | b |
|
537 | b | |
538 | branch: default |
|
538 | branch: default | |
539 | commit: 1 modified, 1 unknown, 1 unresolved |
|
539 | commit: 1 modified, 1 unknown, 1 unresolved | |
540 | update: (current) |
|
540 | update: (current) | |
541 | phases: 2 draft |
|
541 | phases: 2 draft | |
542 | mq: 3 unapplied |
|
542 | mq: 3 unapplied | |
543 |
|
543 | |||
544 | $ echo c > b |
|
544 | $ echo c > b | |
545 | $ hg strip tip |
|
545 | $ hg strip tip | |
546 | abort: local changes found |
|
546 | abort: local changes found | |
547 | [255] |
|
547 | [255] | |
548 | $ hg strip tip --keep |
|
548 | $ hg strip tip --keep | |
549 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
549 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
550 | $ hg log --graph |
|
550 | $ hg log --graph | |
551 | @ changeset: 0:9ab35a2d17cb |
|
551 | @ changeset: 0:9ab35a2d17cb | |
552 | tag: tip |
|
552 | tag: tip | |
553 | user: test |
|
553 | user: test | |
554 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
554 | date: Thu Jan 01 00:00:00 1970 +0000 | |
555 | summary: a |
|
555 | summary: a | |
556 |
|
556 | |||
557 | $ hg status |
|
557 | $ hg status | |
558 | M bar |
|
558 | M bar | |
559 | ? b |
|
559 | ? b | |
560 | ? bar.orig |
|
560 | ? bar.orig | |
561 |
|
561 | |||
562 | $ rm bar.orig |
|
562 | $ rm bar.orig | |
563 | $ hg sum |
|
563 | $ hg sum | |
564 | parent: 0:9ab35a2d17cb tip |
|
564 | parent: 0:9ab35a2d17cb tip | |
565 | a |
|
565 | a | |
566 | branch: default |
|
566 | branch: default | |
567 | commit: 1 modified, 1 unknown |
|
567 | commit: 1 modified, 1 unknown | |
568 | update: (current) |
|
568 | update: (current) | |
569 | phases: 1 draft |
|
569 | phases: 1 draft | |
570 | mq: 3 unapplied |
|
570 | mq: 3 unapplied | |
571 |
|
571 | |||
572 | Strip adds, removes, modifies with --keep |
|
572 | Strip adds, removes, modifies with --keep | |
573 |
|
573 | |||
574 | $ touch b |
|
574 | $ touch b | |
575 | $ hg add b |
|
575 | $ hg add b | |
576 | $ hg commit -mb |
|
576 | $ hg commit -mb | |
577 | $ touch c |
|
577 | $ touch c | |
578 |
|
578 | |||
579 | ... with a clean working dir |
|
579 | ... with a clean 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 | $ hg strip --keep tip |
|
585 | $ hg strip --keep tip | |
586 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
586 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
587 | $ hg status |
|
587 | $ hg status | |
588 | ! bar |
|
588 | ! bar | |
589 | ? c |
|
589 | ? c | |
590 |
|
590 | |||
591 | ... with a dirty working dir |
|
591 | ... with a dirty working dir | |
592 |
|
592 | |||
593 | $ hg add c |
|
593 | $ hg add c | |
594 | $ hg rm bar |
|
594 | $ hg rm bar | |
595 | $ hg commit -mc |
|
595 | $ hg commit -mc | |
596 | $ hg status |
|
596 | $ hg status | |
597 | $ echo b > b |
|
597 | $ echo b > b | |
598 | $ echo d > d |
|
598 | $ echo d > d | |
599 | $ hg strip --keep tip |
|
599 | $ hg strip --keep tip | |
600 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
600 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
601 | $ hg status |
|
601 | $ hg status | |
602 | M b |
|
602 | M b | |
603 | ! bar |
|
603 | ! bar | |
604 | ? c |
|
604 | ? c | |
605 | ? d |
|
605 | ? d | |
606 |
|
606 | |||
607 | ... after updating the dirstate |
|
607 | ... after updating the dirstate | |
608 | $ hg add c |
|
608 | $ hg add c | |
609 | $ hg commit -mc |
|
609 | $ hg commit -mc | |
610 | $ hg rm c |
|
610 | $ hg rm c | |
611 | $ hg commit -mc |
|
611 | $ hg commit -mc | |
612 | $ hg strip --keep '.^' -q |
|
612 | $ hg strip --keep '.^' -q | |
613 | $ cd .. |
|
613 | $ cd .. | |
614 |
|
614 | |||
615 | stripping many nodes on a complex graph (issue3299) |
|
615 | stripping many nodes on a complex graph (issue3299) | |
616 |
|
616 | |||
617 | $ hg init issue3299 |
|
617 | $ hg init issue3299 | |
618 | $ cd issue3299 |
|
618 | $ cd issue3299 | |
619 | $ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a' |
|
619 | $ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a' | |
620 | $ hg strip 'not ancestors(x)' |
|
620 | $ hg strip 'not ancestors(x)' | |
621 | saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob) |
|
621 | saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob) | |
622 |
|
622 | |||
623 | test hg strip -B bookmark |
|
623 | test hg strip -B bookmark | |
624 |
|
624 | |||
625 | $ cd .. |
|
625 | $ cd .. | |
626 | $ hg init bookmarks |
|
626 | $ hg init bookmarks | |
627 | $ cd bookmarks |
|
627 | $ cd bookmarks | |
628 | $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b<m+2:d<2.:e<m+1:f' |
|
628 | $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b<m+2:d<2.:e<m+1:f' | |
629 | $ hg bookmark -r 'a' 'todelete' |
|
629 | $ hg bookmark -r 'a' 'todelete' | |
630 | $ hg bookmark -r 'b' 'B' |
|
630 | $ hg bookmark -r 'b' 'B' | |
631 | $ hg bookmark -r 'b' 'nostrip' |
|
631 | $ hg bookmark -r 'b' 'nostrip' | |
632 | $ hg bookmark -r 'c' 'delete' |
|
632 | $ hg bookmark -r 'c' 'delete' | |
633 | $ hg bookmark -r 'd' 'multipledelete1' |
|
633 | $ hg bookmark -r 'd' 'multipledelete1' | |
634 | $ hg bookmark -r 'e' 'multipledelete2' |
|
634 | $ hg bookmark -r 'e' 'multipledelete2' | |
635 | $ hg bookmark -r 'f' 'singlenode1' |
|
635 | $ hg bookmark -r 'f' 'singlenode1' | |
636 | $ hg bookmark -r 'f' 'singlenode2' |
|
636 | $ hg bookmark -r 'f' 'singlenode2' | |
637 | $ hg up -C todelete |
|
637 | $ hg up -C todelete | |
638 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
638 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
639 | (activating bookmark todelete) |
|
639 | (activating bookmark todelete) | |
640 | $ hg strip -B nostrip |
|
640 | $ hg strip -B nostrip | |
641 | bookmark 'nostrip' deleted |
|
641 | bookmark 'nostrip' deleted | |
642 | abort: empty revision set |
|
642 | abort: empty revision set | |
643 | [255] |
|
643 | [255] | |
644 | $ hg strip -B todelete |
|
644 | $ hg strip -B todelete | |
645 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
645 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
646 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) |
|
646 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) | |
647 | bookmark 'todelete' deleted |
|
647 | bookmark 'todelete' deleted | |
648 | $ hg id -ir dcbb326fdec2 |
|
648 | $ hg id -ir dcbb326fdec2 | |
649 | abort: unknown revision 'dcbb326fdec2'! |
|
649 | abort: unknown revision 'dcbb326fdec2'! | |
650 | [255] |
|
650 | [255] | |
651 | $ hg id -ir d62d843c9a01 |
|
651 | $ hg id -ir d62d843c9a01 | |
652 | d62d843c9a01 |
|
652 | d62d843c9a01 | |
653 | $ hg bookmarks |
|
653 | $ hg bookmarks | |
654 | B 9:ff43616e5d0f |
|
654 | B 9:ff43616e5d0f | |
655 | delete 6:2702dd0c91e7 |
|
655 | delete 6:2702dd0c91e7 | |
656 | multipledelete1 11:e46a4836065c |
|
656 | multipledelete1 11:e46a4836065c | |
657 | multipledelete2 12:b4594d867745 |
|
657 | multipledelete2 12:b4594d867745 | |
658 | singlenode1 13:43227190fef8 |
|
658 | singlenode1 13:43227190fef8 | |
659 | singlenode2 13:43227190fef8 |
|
659 | singlenode2 13:43227190fef8 | |
660 | $ hg strip -B multipledelete1 -B multipledelete2 |
|
660 | $ hg strip -B multipledelete1 -B multipledelete2 | |
661 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg (glob) |
|
661 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg (glob) | |
662 | bookmark 'multipledelete1' deleted |
|
662 | bookmark 'multipledelete1' deleted | |
663 | bookmark 'multipledelete2' deleted |
|
663 | bookmark 'multipledelete2' deleted | |
664 | $ hg id -ir e46a4836065c |
|
664 | $ hg id -ir e46a4836065c | |
665 | abort: unknown revision 'e46a4836065c'! |
|
665 | abort: unknown revision 'e46a4836065c'! | |
666 | [255] |
|
666 | [255] | |
667 | $ hg id -ir b4594d867745 |
|
667 | $ hg id -ir b4594d867745 | |
668 | abort: unknown revision 'b4594d867745'! |
|
668 | abort: unknown revision 'b4594d867745'! | |
669 | [255] |
|
669 | [255] | |
670 | $ hg strip -B singlenode1 -B singlenode2 |
|
670 | $ hg strip -B singlenode1 -B singlenode2 | |
671 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg (glob) |
|
671 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg (glob) | |
672 | bookmark 'singlenode1' deleted |
|
672 | bookmark 'singlenode1' deleted | |
673 | bookmark 'singlenode2' deleted |
|
673 | bookmark 'singlenode2' deleted | |
674 | $ hg id -ir 43227190fef8 |
|
674 | $ hg id -ir 43227190fef8 | |
675 | abort: unknown revision '43227190fef8'! |
|
675 | abort: unknown revision '43227190fef8'! | |
676 | [255] |
|
676 | [255] | |
677 | $ hg strip -B unknownbookmark |
|
677 | $ hg strip -B unknownbookmark | |
678 | abort: bookmark 'unknownbookmark' not found |
|
678 | abort: bookmark 'unknownbookmark' not found | |
679 | [255] |
|
679 | [255] | |
680 | $ hg strip -B unknownbookmark1 -B unknownbookmark2 |
|
680 | $ hg strip -B unknownbookmark1 -B unknownbookmark2 | |
681 | abort: bookmark 'unknownbookmark1,unknownbookmark2' not found |
|
681 | abort: bookmark 'unknownbookmark1,unknownbookmark2' not found | |
682 | [255] |
|
682 | [255] | |
683 | $ hg strip -B delete -B unknownbookmark |
|
683 | $ hg strip -B delete -B unknownbookmark | |
684 | abort: bookmark 'unknownbookmark' not found |
|
684 | abort: bookmark 'unknownbookmark' not found | |
685 | [255] |
|
685 | [255] | |
686 | $ hg strip -B delete |
|
686 | $ hg strip -B delete | |
687 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) |
|
687 | saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) | |
688 | bookmark 'delete' deleted |
|
688 | bookmark 'delete' deleted | |
689 | $ hg id -ir 6:2702dd0c91e7 |
|
689 | $ hg id -ir 6:2702dd0c91e7 | |
690 | abort: unknown revision '2702dd0c91e7'! |
|
690 | abort: unknown revision '2702dd0c91e7'! | |
691 | [255] |
|
691 | [255] | |
692 | $ hg update B |
|
692 | $ hg update B | |
693 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
693 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
694 | (activating bookmark B) |
|
694 | (activating bookmark B) | |
695 | $ echo a > a |
|
695 | $ echo a > a | |
696 | $ hg add a |
|
696 | $ hg add a | |
697 | $ hg strip -B B |
|
697 | $ hg strip -B B | |
698 | abort: local changes found |
|
698 | abort: local changes found | |
699 | [255] |
|
699 | [255] | |
700 | $ hg bookmarks |
|
700 | $ hg bookmarks | |
701 | * B 6:ff43616e5d0f |
|
701 | * B 6:ff43616e5d0f | |
702 |
|
702 | |||
703 | Make sure no one adds back a -b option: |
|
703 | Make sure no one adds back a -b option: | |
704 |
|
704 | |||
705 | $ hg strip -b tip |
|
705 | $ hg strip -b tip | |
706 | hg strip: option -b not recognized |
|
706 | hg strip: option -b not recognized | |
707 | hg strip [-k] [-f] [-B bookmark] [-r] REV... |
|
707 | hg strip [-k] [-f] [-B bookmark] [-r] REV... | |
708 |
|
708 | |||
709 | strip changesets and all their descendants from the repository |
|
709 | strip changesets and all their descendants from the repository | |
710 |
|
710 | |||
711 | (use 'hg help -e strip' to show help for the strip extension) |
|
711 | (use 'hg help -e strip' to show help for the strip extension) | |
712 |
|
712 | |||
713 | options ([+] can be repeated): |
|
713 | options ([+] can be repeated): | |
714 |
|
714 | |||
715 | -r --rev REV [+] strip specified revision (optional, can specify |
|
715 | -r --rev REV [+] strip specified revision (optional, can specify | |
716 | revisions without this option) |
|
716 | revisions without this option) | |
717 | -f --force force removal of changesets, discard uncommitted |
|
717 | -f --force force removal of changesets, discard uncommitted | |
718 | changes (no backup) |
|
718 | changes (no backup) | |
719 | --no-backup no backups |
|
719 | --no-backup no backups | |
720 | -k --keep do not modify working directory during strip |
|
720 | -k --keep do not modify working directory during strip | |
721 | -B --bookmark VALUE [+] remove revs only reachable from given bookmark |
|
721 | -B --bookmark VALUE [+] remove revs only reachable from given bookmark | |
722 | --mq operate on patch repository |
|
722 | --mq operate on patch repository | |
723 |
|
723 | |||
724 | (use 'hg strip -h' to show more help) |
|
724 | (use 'hg strip -h' to show more help) | |
725 | [255] |
|
725 | [255] | |
726 |
|
726 | |||
727 | $ cd .. |
|
727 | $ cd .. | |
728 |
|
728 | |||
729 | Verify bundles don't get overwritten: |
|
729 | Verify bundles don't get overwritten: | |
730 |
|
730 | |||
731 | $ hg init doublebundle |
|
731 | $ hg init doublebundle | |
732 | $ cd doublebundle |
|
732 | $ cd doublebundle | |
733 | $ touch a |
|
733 | $ touch a | |
734 | $ hg commit -Aqm a |
|
734 | $ hg commit -Aqm a | |
735 | $ touch b |
|
735 | $ touch b | |
736 | $ hg commit -Aqm b |
|
736 | $ hg commit -Aqm b | |
737 | $ hg strip -r 0 |
|
737 | $ hg strip -r 0 | |
738 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
738 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
739 | saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg (glob) |
|
739 | saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg (glob) | |
740 | $ ls .hg/strip-backup |
|
740 | $ ls .hg/strip-backup | |
741 | 3903775176ed-e68910bd-backup.hg |
|
741 | 3903775176ed-e68910bd-backup.hg | |
742 | $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg |
|
742 | $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg | |
743 | $ hg strip -r 0 |
|
743 | $ hg strip -r 0 | |
744 | saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg (glob) |
|
744 | saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg (glob) | |
745 | $ ls .hg/strip-backup |
|
745 | $ ls .hg/strip-backup | |
746 | 3903775176ed-54390173-backup.hg |
|
746 | 3903775176ed-54390173-backup.hg | |
747 | 3903775176ed-e68910bd-backup.hg |
|
747 | 3903775176ed-e68910bd-backup.hg | |
748 | $ cd .. |
|
748 | $ cd .. | |
749 |
|
749 | |||
750 | Test that we only bundle the stripped changesets (issue4736) |
|
750 | Test that we only bundle the stripped changesets (issue4736) | |
751 | ------------------------------------------------------------ |
|
751 | ------------------------------------------------------------ | |
752 |
|
752 | |||
753 | initialization (previous repo is empty anyway) |
|
753 | initialization (previous repo is empty anyway) | |
754 |
|
754 | |||
755 | $ hg init issue4736 |
|
755 | $ hg init issue4736 | |
756 | $ cd issue4736 |
|
756 | $ cd issue4736 | |
757 | $ echo a > a |
|
757 | $ echo a > a | |
758 | $ hg add a |
|
758 | $ hg add a | |
759 | $ hg commit -m commitA |
|
759 | $ hg commit -m commitA | |
760 | $ echo b > b |
|
760 | $ echo b > b | |
761 | $ hg add b |
|
761 | $ hg add b | |
762 | $ hg commit -m commitB |
|
762 | $ hg commit -m commitB | |
763 | $ echo c > c |
|
763 | $ echo c > c | |
764 | $ hg add c |
|
764 | $ hg add c | |
765 | $ hg commit -m commitC |
|
765 | $ hg commit -m commitC | |
766 | $ hg up 'desc(commitB)' |
|
766 | $ hg up 'desc(commitB)' | |
767 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
767 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
768 | $ echo d > d |
|
768 | $ echo d > d | |
769 | $ hg add d |
|
769 | $ hg add d | |
770 | $ hg commit -m commitD |
|
770 | $ hg commit -m commitD | |
771 | created new head |
|
771 | created new head | |
772 | $ hg up 'desc(commitC)' |
|
772 | $ hg up 'desc(commitC)' | |
773 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
773 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
774 | $ hg merge 'desc(commitD)' |
|
774 | $ hg merge 'desc(commitD)' | |
775 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
775 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
776 | (branch merge, don't forget to commit) |
|
776 | (branch merge, don't forget to commit) | |
777 | $ hg ci -m 'mergeCD' |
|
777 | $ hg ci -m 'mergeCD' | |
778 | $ hg log -G |
|
778 | $ hg log -G | |
779 | @ changeset: 4:d8db9d137221 |
|
779 | @ changeset: 4:d8db9d137221 | |
780 | |\ tag: tip |
|
780 | |\ tag: tip | |
781 | | | parent: 2:5c51d8d6557d |
|
781 | | | parent: 2:5c51d8d6557d | |
782 | | | parent: 3:6625a5168474 |
|
782 | | | parent: 3:6625a5168474 | |
783 | | | user: test |
|
783 | | | user: test | |
784 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
784 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
785 | | | summary: mergeCD |
|
785 | | | summary: mergeCD | |
786 | | | |
|
786 | | | | |
787 | | o changeset: 3:6625a5168474 |
|
787 | | o changeset: 3:6625a5168474 | |
788 | | | parent: 1:eca11cf91c71 |
|
788 | | | parent: 1:eca11cf91c71 | |
789 | | | user: test |
|
789 | | | user: test | |
790 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
790 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
791 | | | summary: commitD |
|
791 | | | summary: commitD | |
792 | | | |
|
792 | | | | |
793 | o | changeset: 2:5c51d8d6557d |
|
793 | o | changeset: 2:5c51d8d6557d | |
794 | |/ user: test |
|
794 | |/ user: test | |
795 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
795 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
796 | | summary: commitC |
|
796 | | summary: commitC | |
797 | | |
|
797 | | | |
798 | o changeset: 1:eca11cf91c71 |
|
798 | o changeset: 1:eca11cf91c71 | |
799 | | user: test |
|
799 | | user: test | |
800 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
800 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
801 | | summary: commitB |
|
801 | | summary: commitB | |
802 | | |
|
802 | | | |
803 | o changeset: 0:105141ef12d0 |
|
803 | o changeset: 0:105141ef12d0 | |
804 | user: test |
|
804 | user: test | |
805 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
805 | date: Thu Jan 01 00:00:00 1970 +0000 | |
806 | summary: commitA |
|
806 | summary: commitA | |
807 |
|
807 | |||
808 |
|
808 | |||
809 | Check bundle behavior: |
|
809 | Check bundle behavior: | |
810 |
|
810 | |||
811 | $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg |
|
811 | $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg | |
812 | 2 changesets found |
|
812 | 2 changesets found | |
813 | $ hg log -r 'bundle()' -R ../issue4736.hg |
|
813 | $ hg log -r 'bundle()' -R ../issue4736.hg | |
814 | changeset: 3:6625a5168474 |
|
814 | changeset: 3:6625a5168474 | |
815 | parent: 1:eca11cf91c71 |
|
815 | parent: 1:eca11cf91c71 | |
816 | user: test |
|
816 | user: test | |
817 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
817 | date: Thu Jan 01 00:00:00 1970 +0000 | |
818 | summary: commitD |
|
818 | summary: commitD | |
819 |
|
819 | |||
820 | changeset: 4:d8db9d137221 |
|
820 | changeset: 4:d8db9d137221 | |
821 | tag: tip |
|
821 | tag: tip | |
822 | parent: 2:5c51d8d6557d |
|
822 | parent: 2:5c51d8d6557d | |
823 | parent: 3:6625a5168474 |
|
823 | parent: 3:6625a5168474 | |
824 | user: test |
|
824 | user: test | |
825 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
825 | date: Thu Jan 01 00:00:00 1970 +0000 | |
826 | summary: mergeCD |
|
826 | summary: mergeCD | |
827 |
|
827 | |||
828 |
|
828 | |||
829 | check strip behavior |
|
829 | check strip behavior | |
830 |
|
830 | |||
831 | $ hg --config extensions.strip= strip 'desc(commitD)' --debug |
|
831 | $ hg --config extensions.strip= strip 'desc(commitD)' --debug | |
832 | resolving manifests |
|
832 | resolving manifests | |
833 | branchmerge: False, force: True, partial: False |
|
833 | branchmerge: False, force: True, partial: False | |
834 | ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71 |
|
834 | ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71 | |
835 | c: other deleted -> r |
|
835 | c: other deleted -> r | |
836 | removing c |
|
836 | removing c | |
837 | d: other deleted -> r |
|
837 | d: other deleted -> r | |
838 | removing d |
|
838 | removing d | |
839 | starting 4 threads for background file closing (?) |
|
839 | starting 4 threads for background file closing (?) | |
840 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
840 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
841 | 2 changesets found |
|
841 | 2 changesets found | |
842 | list of changesets: |
|
842 | list of changesets: | |
843 | 6625a516847449b6f0fa3737b9ba56e9f0f3032c |
|
843 | 6625a516847449b6f0fa3737b9ba56e9f0f3032c | |
844 | d8db9d1372214336d2b5570f20ee468d2c72fa8b |
|
844 | d8db9d1372214336d2b5570f20ee468d2c72fa8b | |
845 | bundle2-output-bundle: "HG20", (1 params) 2 parts total |
|
845 | bundle2-output-bundle: "HG20", (1 params) 2 parts total | |
846 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
|
846 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload | |
847 | bundle2-output-part: "phase-heads" 24 bytes payload |
|
847 | bundle2-output-part: "phase-heads" 24 bytes payload | |
848 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob) |
|
848 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob) | |
849 | updating the branch cache |
|
849 | updating the branch cache | |
850 | invalid branchheads cache (served): tip differs |
|
850 | invalid branchheads cache (served): tip differs | |
851 | truncating cache/rbc-revs-v1 to 24 |
|
851 | truncating cache/rbc-revs-v1 to 24 | |
852 | $ hg log -G |
|
852 | $ hg log -G | |
853 | o changeset: 2:5c51d8d6557d |
|
853 | o changeset: 2:5c51d8d6557d | |
854 | | tag: tip |
|
854 | | tag: tip | |
855 | | user: test |
|
855 | | user: test | |
856 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
856 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
857 | | summary: commitC |
|
857 | | summary: commitC | |
858 | | |
|
858 | | | |
859 | @ changeset: 1:eca11cf91c71 |
|
859 | @ changeset: 1:eca11cf91c71 | |
860 | | user: test |
|
860 | | user: test | |
861 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
861 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
862 | | summary: commitB |
|
862 | | summary: commitB | |
863 | | |
|
863 | | | |
864 | o changeset: 0:105141ef12d0 |
|
864 | o changeset: 0:105141ef12d0 | |
865 | user: test |
|
865 | user: test | |
866 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
866 | date: Thu Jan 01 00:00:00 1970 +0000 | |
867 | summary: commitA |
|
867 | summary: commitA | |
868 |
|
868 | |||
869 |
|
869 | |||
870 | strip backup content |
|
870 | strip backup content | |
871 |
|
871 | |||
872 | $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg |
|
872 | $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg | |
873 | changeset: 3:6625a5168474 |
|
873 | changeset: 3:6625a5168474 | |
874 | parent: 1:eca11cf91c71 |
|
874 | parent: 1:eca11cf91c71 | |
875 | user: test |
|
875 | user: test | |
876 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
876 | date: Thu Jan 01 00:00:00 1970 +0000 | |
877 | summary: commitD |
|
877 | summary: commitD | |
878 |
|
878 | |||
879 | changeset: 4:d8db9d137221 |
|
879 | changeset: 4:d8db9d137221 | |
880 | tag: tip |
|
880 | tag: tip | |
881 | parent: 2:5c51d8d6557d |
|
881 | parent: 2:5c51d8d6557d | |
882 | parent: 3:6625a5168474 |
|
882 | parent: 3:6625a5168474 | |
883 | user: test |
|
883 | user: test | |
884 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
884 | date: Thu Jan 01 00:00:00 1970 +0000 | |
885 | summary: mergeCD |
|
885 | summary: mergeCD | |
886 |
|
886 | |||
887 | Check that the phase cache is properly invalidated after a strip with bookmark. |
|
887 | Check that the phase cache is properly invalidated after a strip with bookmark. | |
888 |
|
888 | |||
889 | $ cat > ../stripstalephasecache.py << EOF |
|
889 | $ cat > ../stripstalephasecache.py << EOF | |
890 | > from mercurial import extensions, localrepo |
|
890 | > from mercurial import extensions, localrepo | |
891 | > def transactioncallback(orig, repo, desc, *args, **kwargs): |
|
891 | > def transactioncallback(orig, repo, desc, *args, **kwargs): | |
892 | > def test(transaction): |
|
892 | > def test(transaction): | |
893 | > # observe cache inconsistency |
|
893 | > # observe cache inconsistency | |
894 | > try: |
|
894 | > try: | |
895 | > [repo.changelog.node(r) for r in repo.revs("not public()")] |
|
895 | > [repo.changelog.node(r) for r in repo.revs("not public()")] | |
896 | > except IndexError: |
|
896 | > except IndexError: | |
897 | > repo.ui.status("Index error!\n") |
|
897 | > repo.ui.status("Index error!\n") | |
898 | > transaction = orig(repo, desc, *args, **kwargs) |
|
898 | > transaction = orig(repo, desc, *args, **kwargs) | |
899 | > # warm up the phase cache |
|
899 | > # warm up the phase cache | |
900 | > list(repo.revs("not public()")) |
|
900 | > list(repo.revs("not public()")) | |
901 | > if desc != 'strip': |
|
901 | > if desc != 'strip': | |
902 | > transaction.addpostclose("phase invalidation test", test) |
|
902 | > transaction.addpostclose("phase invalidation test", test) | |
903 | > return transaction |
|
903 | > return transaction | |
904 | > def extsetup(ui): |
|
904 | > def extsetup(ui): | |
905 | > extensions.wrapfunction(localrepo.localrepository, "transaction", |
|
905 | > extensions.wrapfunction(localrepo.localrepository, "transaction", | |
906 | > transactioncallback) |
|
906 | > transactioncallback) | |
907 | > EOF |
|
907 | > EOF | |
908 | $ hg up -C 2 |
|
908 | $ hg up -C 2 | |
909 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
909 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
910 | $ echo k > k |
|
910 | $ echo k > k | |
911 | $ hg add k |
|
911 | $ hg add k | |
912 | $ hg commit -m commitK |
|
912 | $ hg commit -m commitK | |
913 | $ echo l > l |
|
913 | $ echo l > l | |
914 | $ hg add l |
|
914 | $ hg add l | |
915 | $ hg commit -m commitL |
|
915 | $ hg commit -m commitL | |
916 | $ hg book -r tip blah |
|
916 | $ hg book -r tip blah | |
917 | $ hg strip ".^" --config extensions.crash=$TESTTMP/stripstalephasecache.py |
|
917 | $ hg strip ".^" --config extensions.crash=$TESTTMP/stripstalephasecache.py | |
918 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
918 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
919 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg (glob) |
|
919 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg (glob) | |
920 | $ hg up -C 1 |
|
920 | $ hg up -C 1 | |
921 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
921 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
922 |
|
922 | |||
923 | Error during post-close callback of the strip transaction |
|
923 | Error during post-close callback of the strip transaction | |
924 | (They should be gracefully handled and reported) |
|
924 | (They should be gracefully handled and reported) | |
925 |
|
925 | |||
926 | $ cat > ../crashstrip.py << EOF |
|
926 | $ cat > ../crashstrip.py << EOF | |
927 | > from mercurial import error |
|
927 | > from mercurial import error | |
928 | > def reposetup(ui, repo): |
|
928 | > def reposetup(ui, repo): | |
929 | > class crashstriprepo(repo.__class__): |
|
929 | > class crashstriprepo(repo.__class__): | |
930 | > def transaction(self, desc, *args, **kwargs): |
|
930 | > def transaction(self, desc, *args, **kwargs): | |
931 | > tr = super(crashstriprepo, self).transaction(desc, *args, **kwargs) |
|
931 | > tr = super(crashstriprepo, self).transaction(desc, *args, **kwargs) | |
932 | > if desc == 'strip': |
|
932 | > if desc == 'strip': | |
933 | > def crash(tra): raise error.Abort('boom') |
|
933 | > def crash(tra): raise error.Abort('boom') | |
934 | > tr.addpostclose('crash', crash) |
|
934 | > tr.addpostclose('crash', crash) | |
935 | > return tr |
|
935 | > return tr | |
936 | > repo.__class__ = crashstriprepo |
|
936 | > repo.__class__ = crashstriprepo | |
937 | > EOF |
|
937 | > EOF | |
938 | $ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py |
|
938 | $ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py | |
939 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg (glob) |
|
939 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg (glob) | |
940 | strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg' (glob) |
|
940 | strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg' (glob) | |
941 | abort: boom |
|
941 | abort: boom | |
942 | [255] |
|
942 | [255] | |
943 |
|
943 | |||
944 | Use delayedstrip to strip inside a transaction |
|
944 | Use delayedstrip to strip inside a transaction | |
945 |
|
945 | |||
946 | $ cd $TESTTMP |
|
946 | $ cd $TESTTMP | |
947 | $ hg init delayedstrip |
|
947 | $ hg init delayedstrip | |
948 | $ cd delayedstrip |
|
948 | $ cd delayedstrip | |
949 | $ hg debugdrawdag <<'EOS' |
|
949 | $ hg debugdrawdag <<'EOS' | |
950 | > D |
|
950 | > D | |
951 | > | |
|
951 | > | | |
952 | > C F H # Commit on top of "I", |
|
952 | > C F H # Commit on top of "I", | |
953 | > | |/| # Strip B+D+I+E+G+H+Z |
|
953 | > | |/| # Strip B+D+I+E+G+H+Z | |
954 | > I B E G |
|
954 | > I B E G | |
955 | > \|/ |
|
955 | > \|/ | |
956 | > A Z |
|
956 | > A Z | |
957 | > EOS |
|
957 | > EOS | |
958 | $ cp -R . ../scmutilcleanup |
|
958 | $ cp -R . ../scmutilcleanup | |
959 |
|
959 | |||
960 | $ hg up -C I |
|
960 | $ hg up -C I | |
961 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
961 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
962 | $ echo 3 >> I |
|
962 | $ echo 3 >> I | |
963 | $ cat > $TESTTMP/delayedstrip.py <<EOF |
|
963 | $ cat > $TESTTMP/delayedstrip.py <<EOF | |
964 | > from __future__ import absolute_import |
|
964 | > from __future__ import absolute_import | |
965 | > from mercurial import commands, repair |
|
965 | > from mercurial import commands, registrar, repair | |
966 | > def reposetup(ui, repo): |
|
966 | > cmdtable = {} | |
|
967 | > command = registrar.command(cmdtable) | |||
|
968 | > @command('testdelayedstrip') | |||
|
969 | > def testdelayedstrip(ui, repo): | |||
967 | > def getnodes(expr): |
|
970 | > def getnodes(expr): | |
968 | > return [repo.changelog.node(r) for r in repo.revs(expr)] |
|
971 | > return [repo.changelog.node(r) for r in repo.revs(expr)] | |
969 | > with repo.wlock(): |
|
972 | > with repo.wlock(): | |
970 | > with repo.lock(): |
|
973 | > with repo.lock(): | |
971 | > with repo.transaction('delayedstrip'): |
|
974 | > with repo.transaction('delayedstrip'): | |
972 | > repair.delayedstrip(ui, repo, getnodes('B+I+Z+D+E'), 'J') |
|
975 | > repair.delayedstrip(ui, repo, getnodes('B+I+Z+D+E'), 'J') | |
973 | > repair.delayedstrip(ui, repo, getnodes('G+H+Z'), 'I') |
|
976 | > repair.delayedstrip(ui, repo, getnodes('G+H+Z'), 'I') | |
974 | > commands.commit(ui, repo, message='J', date='0 0') |
|
977 | > commands.commit(ui, repo, message='J', date='0 0') | |
975 | > EOF |
|
978 | > EOF | |
976 |
$ hg |
|
979 | $ hg testdelayedstrip --config extensions.t=$TESTTMP/delayedstrip.py | |
977 | warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22 |
|
980 | warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22 | |
978 | saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg (glob) |
|
981 | saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg (glob) | |
979 |
|
982 | |||
980 | $ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)' |
|
983 | $ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)' | |
981 | @ 6:2f2d51af6205 J |
|
984 | @ 6:2f2d51af6205 J | |
982 | | |
|
985 | | | |
983 | o 3:08ebfeb61bac I |
|
986 | o 3:08ebfeb61bac I | |
984 | | |
|
987 | | | |
985 | | o 5:64a8289d2492 F |
|
988 | | o 5:64a8289d2492 F | |
986 | | | |
|
989 | | | | |
987 | | o 2:7fb047a69f22 E |
|
990 | | o 2:7fb047a69f22 E | |
988 | |/ |
|
991 | |/ | |
989 | | o 4:26805aba1e60 C |
|
992 | | o 4:26805aba1e60 C | |
990 | | | |
|
993 | | | | |
991 | | o 1:112478962961 B |
|
994 | | o 1:112478962961 B | |
992 | |/ |
|
995 | |/ | |
993 | o 0:426bada5c675 A |
|
996 | o 0:426bada5c675 A | |
994 |
|
997 | |||
995 | Test high-level scmutil.cleanupnodes API |
|
998 | Test high-level scmutil.cleanupnodes API | |
996 |
|
999 | |||
997 | $ cd $TESTTMP/scmutilcleanup |
|
1000 | $ cd $TESTTMP/scmutilcleanup | |
998 | $ hg debugdrawdag <<'EOS' |
|
1001 | $ hg debugdrawdag <<'EOS' | |
999 | > D2 F2 G2 # D2, F2, G2 are replacements for D, F, G |
|
1002 | > D2 F2 G2 # D2, F2, G2 are replacements for D, F, G | |
1000 | > | | | |
|
1003 | > | | | | |
1001 | > C H G |
|
1004 | > C H G | |
1002 | > EOS |
|
1005 | > EOS | |
1003 | $ for i in B C D F G I Z; do |
|
1006 | $ for i in B C D F G I Z; do | |
1004 | > hg bookmark -i -r $i b-$i |
|
1007 | > hg bookmark -i -r $i b-$i | |
1005 | > done |
|
1008 | > done | |
1006 | $ hg bookmark -i -r E 'b-F@divergent1' |
|
1009 | $ hg bookmark -i -r E 'b-F@divergent1' | |
1007 | $ hg bookmark -i -r H 'b-F@divergent2' |
|
1010 | $ hg bookmark -i -r H 'b-F@divergent2' | |
1008 | $ hg bookmark -i -r G 'b-F@divergent3' |
|
1011 | $ hg bookmark -i -r G 'b-F@divergent3' | |
1009 | $ cp -R . ../scmutilcleanup.obsstore |
|
1012 | $ cp -R . ../scmutilcleanup.obsstore | |
1010 |
|
1013 | |||
1011 | $ cat > $TESTTMP/scmutilcleanup.py <<EOF |
|
1014 | $ cat > $TESTTMP/scmutilcleanup.py <<EOF | |
1012 | > from mercurial import scmutil |
|
1015 | > from mercurial import registrar, scmutil | |
1013 | > def reposetup(ui, repo): |
|
1016 | > cmdtable = {} | |
|
1017 | > command = registrar.command(cmdtable) | |||
|
1018 | > @command('testnodescleanup') | |||
|
1019 | > def testnodescleanup(ui, repo): | |||
1014 | > def nodes(expr): |
|
1020 | > def nodes(expr): | |
1015 | > return [repo.changelog.node(r) for r in repo.revs(expr)] |
|
1021 | > return [repo.changelog.node(r) for r in repo.revs(expr)] | |
1016 | > def node(expr): |
|
1022 | > def node(expr): | |
1017 | > return nodes(expr)[0] |
|
1023 | > return nodes(expr)[0] | |
1018 | > with repo.wlock(): |
|
1024 | > with repo.wlock(): | |
1019 | > with repo.lock(): |
|
1025 | > with repo.lock(): | |
1020 | > with repo.transaction('delayedstrip'): |
|
1026 | > with repo.transaction('delayedstrip'): | |
1021 | > mapping = {node('F'): [node('F2')], |
|
1027 | > mapping = {node('F'): [node('F2')], | |
1022 | > node('D'): [node('D2')], |
|
1028 | > node('D'): [node('D2')], | |
1023 | > node('G'): [node('G2')]} |
|
1029 | > node('G'): [node('G2')]} | |
1024 | > scmutil.cleanupnodes(repo, mapping, 'replace') |
|
1030 | > scmutil.cleanupnodes(repo, mapping, 'replace') | |
1025 | > scmutil.cleanupnodes(repo, nodes('((B::)+I+Z)-D2'), 'replace') |
|
1031 | > scmutil.cleanupnodes(repo, nodes('((B::)+I+Z)-D2'), 'replace') | |
1026 | > EOF |
|
1032 | > EOF | |
1027 |
$ hg |
|
1033 | $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py | |
1028 | warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60 |
|
1034 | warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60 | |
1029 | saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg (glob) |
|
1035 | saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg (glob) | |
1030 |
|
1036 | |||
1031 | $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' |
|
1037 | $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' | |
1032 | o 8:1473d4b996d1 G2 b-F@divergent3 b-G |
|
1038 | o 8:1473d4b996d1 G2 b-F@divergent3 b-G | |
1033 | | |
|
1039 | | | |
1034 | | o 7:d11b3456a873 F2 b-F |
|
1040 | | o 7:d11b3456a873 F2 b-F | |
1035 | | | |
|
1041 | | | | |
1036 | | o 5:5cb05ba470a7 H |
|
1042 | | o 5:5cb05ba470a7 H | |
1037 | |/| |
|
1043 | |/| | |
1038 | | o 3:7fb047a69f22 E b-F@divergent1 |
|
1044 | | o 3:7fb047a69f22 E b-F@divergent1 | |
1039 | | | |
|
1045 | | | | |
1040 | | | o 6:7c78f703e465 D2 b-D |
|
1046 | | | o 6:7c78f703e465 D2 b-D | |
1041 | | | | |
|
1047 | | | | | |
1042 | | | o 4:26805aba1e60 C |
|
1048 | | | o 4:26805aba1e60 C | |
1043 | | | | |
|
1049 | | | | | |
1044 | | | o 2:112478962961 B |
|
1050 | | | o 2:112478962961 B | |
1045 | | |/ |
|
1051 | | |/ | |
1046 | o | 1:1fc8102cda62 G |
|
1052 | o | 1:1fc8102cda62 G | |
1047 | / |
|
1053 | / | |
1048 | o 0:426bada5c675 A b-B b-C b-I |
|
1054 | o 0:426bada5c675 A b-B b-C b-I | |
1049 |
|
1055 | |||
1050 | $ hg bookmark |
|
1056 | $ hg bookmark | |
1051 | b-B 0:426bada5c675 |
|
1057 | b-B 0:426bada5c675 | |
1052 | b-C 0:426bada5c675 |
|
1058 | b-C 0:426bada5c675 | |
1053 | b-D 6:7c78f703e465 |
|
1059 | b-D 6:7c78f703e465 | |
1054 | b-F 7:d11b3456a873 |
|
1060 | b-F 7:d11b3456a873 | |
1055 | b-F@divergent1 3:7fb047a69f22 |
|
1061 | b-F@divergent1 3:7fb047a69f22 | |
1056 | b-F@divergent3 8:1473d4b996d1 |
|
1062 | b-F@divergent3 8:1473d4b996d1 | |
1057 | b-G 8:1473d4b996d1 |
|
1063 | b-G 8:1473d4b996d1 | |
1058 | b-I 0:426bada5c675 |
|
1064 | b-I 0:426bada5c675 | |
1059 | b-Z -1:000000000000 |
|
1065 | b-Z -1:000000000000 | |
1060 |
|
1066 | |||
1061 | Test the above using obsstore "by the way". Not directly related to strip, but |
|
1067 | Test the above using obsstore "by the way". Not directly related to strip, but | |
1062 | we have reusable code here |
|
1068 | we have reusable code here | |
1063 |
|
1069 | |||
1064 | $ cd $TESTTMP/scmutilcleanup.obsstore |
|
1070 | $ cd $TESTTMP/scmutilcleanup.obsstore | |
1065 | $ cat >> .hg/hgrc <<EOF |
|
1071 | $ cat >> .hg/hgrc <<EOF | |
1066 | > [experimental] |
|
1072 | > [experimental] | |
1067 | > stabilization=all |
|
1073 | > stabilization=all | |
1068 | > stabilization.track-operation=1 |
|
1074 | > stabilization.track-operation=1 | |
1069 | > EOF |
|
1075 | > EOF | |
1070 |
|
1076 | |||
1071 |
$ hg |
|
1077 | $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py | |
1072 |
|
1078 | |||
1073 | $ rm .hg/localtags |
|
1079 | $ rm .hg/localtags | |
1074 | $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' |
|
1080 | $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' | |
1075 | o 12:1473d4b996d1 G2 b-F@divergent3 b-G |
|
1081 | o 12:1473d4b996d1 G2 b-F@divergent3 b-G | |
1076 | | |
|
1082 | | | |
1077 | | o 11:d11b3456a873 F2 b-F |
|
1083 | | o 11:d11b3456a873 F2 b-F | |
1078 | | | |
|
1084 | | | | |
1079 | | o 8:5cb05ba470a7 H |
|
1085 | | o 8:5cb05ba470a7 H | |
1080 | |/| |
|
1086 | |/| | |
1081 | | o 4:7fb047a69f22 E b-F@divergent1 |
|
1087 | | o 4:7fb047a69f22 E b-F@divergent1 | |
1082 | | | |
|
1088 | | | | |
1083 | | | o 10:7c78f703e465 D2 b-D |
|
1089 | | | o 10:7c78f703e465 D2 b-D | |
1084 | | | | |
|
1090 | | | | | |
1085 | | | x 6:26805aba1e60 C |
|
1091 | | | x 6:26805aba1e60 C | |
1086 | | | | |
|
1092 | | | | | |
1087 | | | x 3:112478962961 B |
|
1093 | | | x 3:112478962961 B | |
1088 | | |/ |
|
1094 | | |/ | |
1089 | x | 1:1fc8102cda62 G |
|
1095 | x | 1:1fc8102cda62 G | |
1090 | / |
|
1096 | / | |
1091 | o 0:426bada5c675 A b-B b-C b-I |
|
1097 | o 0:426bada5c675 A b-B b-C b-I | |
1092 |
|
1098 | |||
1093 | $ hg debugobsolete |
|
1099 | $ hg debugobsolete | |
1094 | 1fc8102cda6204549f031015641606ccf5513ec3 1473d4b996d1d1b121de6b39fab6a04fbf9d873e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} |
|
1100 | 1fc8102cda6204549f031015641606ccf5513ec3 1473d4b996d1d1b121de6b39fab6a04fbf9d873e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} | |
1095 | 64a8289d249234b9886244d379f15e6b650b28e3 d11b3456a873daec7c7bc53e5622e8df6d741bd2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} |
|
1101 | 64a8289d249234b9886244d379f15e6b650b28e3 d11b3456a873daec7c7bc53e5622e8df6d741bd2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} | |
1096 | f585351a92f85104bff7c284233c338b10eb1df7 7c78f703e465d73102cc8780667ce269c5208a40 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} |
|
1102 | f585351a92f85104bff7c284233c338b10eb1df7 7c78f703e465d73102cc8780667ce269c5208a40 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} | |
1097 | 48b9aae0607f43ff110d84e6883c151942add5ab 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} |
|
1103 | 48b9aae0607f43ff110d84e6883c151942add5ab 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} | |
1098 | 112478962961147124edd43549aedd1a335e44bf 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} |
|
1104 | 112478962961147124edd43549aedd1a335e44bf 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} | |
1099 | 08ebfeb61bac6e3f12079de774d285a0d6689eba 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} |
|
1105 | 08ebfeb61bac6e3f12079de774d285a0d6689eba 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} | |
1100 | 26805aba1e600a82e93661149f2313866a221a7b 0 {112478962961147124edd43549aedd1a335e44bf} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} |
|
1106 | 26805aba1e600a82e93661149f2313866a221a7b 0 {112478962961147124edd43549aedd1a335e44bf} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} | |
1101 | $ cd .. |
|
1107 | $ cd .. | |
1102 |
|
1108 | |||
1103 | Test that obsmarkers are restored even when not using generaldelta |
|
1109 | Test that obsmarkers are restored even when not using generaldelta | |
1104 |
|
1110 | |||
1105 | $ hg --config format.usegeneraldelta=no init issue5678 |
|
1111 | $ hg --config format.usegeneraldelta=no init issue5678 | |
1106 | $ cd issue5678 |
|
1112 | $ cd issue5678 | |
1107 | $ cat >> .hg/hgrc <<EOF |
|
1113 | $ cat >> .hg/hgrc <<EOF | |
1108 | > [experimental] |
|
1114 | > [experimental] | |
1109 | > evolution=all |
|
1115 | > evolution=all | |
1110 | > EOF |
|
1116 | > EOF | |
1111 | $ echo a > a |
|
1117 | $ echo a > a | |
1112 | $ hg ci -Aqm a |
|
1118 | $ hg ci -Aqm a | |
1113 | $ hg ci --amend -m a2 |
|
1119 | $ hg ci --amend -m a2 | |
1114 | $ hg debugobsolete |
|
1120 | $ hg debugobsolete | |
1115 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1121 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1116 | $ hg strip . |
|
1122 | $ hg strip . | |
1117 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1123 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1118 | saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg (glob) |
|
1124 | saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg (glob) | |
1119 | $ hg unbundle -q .hg/strip-backup/* |
|
1125 | $ hg unbundle -q .hg/strip-backup/* | |
1120 | $ hg debugobsolete |
|
1126 | $ hg debugobsolete | |
1121 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1127 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1122 | $ cd .. |
|
1128 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now