75 user: test |
75 user: test |
76 date: Thu Jan 01 00:00:00 1970 +0000 |
76 date: Thu Jan 01 00:00:00 1970 +0000 |
77 summary: e |
77 summary: e |
78 |
78 |
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
80 saved backup bundle to * (glob) |
80 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
81 % after update 4, strip 4 |
81 % after update 4, strip 4 |
82 changeset: 3:65bd5f99a4a3 |
82 changeset: 3:65bd5f99a4a3 |
83 tag: tip |
83 tag: tip |
84 parent: 1:ef3a871183d7 |
84 parent: 1:ef3a871183d7 |
85 user: test |
85 user: test |
94 user: test |
94 user: test |
95 date: Thu Jan 01 00:00:00 1970 +0000 |
95 date: Thu Jan 01 00:00:00 1970 +0000 |
96 summary: e |
96 summary: e |
97 |
97 |
98 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
98 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
99 saved backup bundle to * (glob) |
99 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
100 % after update 4, strip 3 |
100 % after update 4, strip 3 |
101 changeset: 1:ef3a871183d7 |
101 changeset: 1:ef3a871183d7 |
102 user: test |
102 user: test |
103 date: Thu Jan 01 00:00:00 1970 +0000 |
103 date: Thu Jan 01 00:00:00 1970 +0000 |
104 summary: b |
104 summary: b |
109 changeset: 1:ef3a871183d7 |
109 changeset: 1:ef3a871183d7 |
110 user: test |
110 user: test |
111 date: Thu Jan 01 00:00:00 1970 +0000 |
111 date: Thu Jan 01 00:00:00 1970 +0000 |
112 summary: b |
112 summary: b |
113 |
113 |
114 saved backup bundle to * (glob) |
114 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
115 % after update 1, strip 4 |
115 % after update 1, strip 4 |
116 changeset: 1:ef3a871183d7 |
116 changeset: 1:ef3a871183d7 |
117 user: test |
117 user: test |
118 date: Thu Jan 01 00:00:00 1970 +0000 |
118 date: Thu Jan 01 00:00:00 1970 +0000 |
119 summary: b |
119 summary: b |
125 tag: tip |
125 tag: tip |
126 user: test |
126 user: test |
127 date: Thu Jan 01 00:00:00 1970 +0000 |
127 date: Thu Jan 01 00:00:00 1970 +0000 |
128 summary: e |
128 summary: e |
129 |
129 |
130 saved backup bundle to * (glob) |
130 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
131 % after update 4, strip 2 |
131 % after update 4, strip 2 |
132 changeset: 3:443431ffac4f |
132 changeset: 3:443431ffac4f |
133 tag: tip |
133 tag: tip |
134 user: test |
134 user: test |
135 date: Thu Jan 01 00:00:00 1970 +0000 |
135 date: Thu Jan 01 00:00:00 1970 +0000 |
144 user: test |
144 user: test |
145 date: Thu Jan 01 00:00:00 1970 +0000 |
145 date: Thu Jan 01 00:00:00 1970 +0000 |
146 summary: c |
146 summary: c |
147 |
147 |
148 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
148 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149 saved backup bundle to * (glob) |
149 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
150 % after update 4, strip 1 |
150 % after update 4, strip 1 |
151 changeset: 0:9ab35a2d17cb |
151 changeset: 0:9ab35a2d17cb |
152 tag: tip |
152 tag: tip |
153 user: test |
153 user: test |
154 date: Thu Jan 01 00:00:00 1970 +0000 |
154 date: Thu Jan 01 00:00:00 1970 +0000 |
155 summary: a |
155 summary: a |
156 |
156 |
157 $ teststrip null 4 |
157 $ teststrip null 4 |
158 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
158 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
159 % before update null, strip 4 |
159 % before update null, strip 4 |
160 saved backup bundle to * (glob) |
160 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
161 % after update null, strip 4 |
161 % after update null, strip 4 |
162 |
162 |
163 $ hg log |
163 $ hg log |
164 changeset: 4:264128213d29 |
164 changeset: 4:264128213d29 |
165 tag: tip |
165 tag: tip |
210 date: Thu Jan 01 00:00:00 1970 +0000 |
210 date: Thu Jan 01 00:00:00 1970 +0000 |
211 summary: c |
211 summary: c |
212 |
212 |
213 $ hg strip 4 |
213 $ hg strip 4 |
214 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
214 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
215 saved backup bundle to * (glob) |
215 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
216 |
216 |
217 after strip of merge parent |
217 after strip of merge parent |
218 |
218 |
219 $ hg parents |
219 $ hg parents |
220 changeset: 1:ef3a871183d7 |
220 changeset: 1:ef3a871183d7 |
308 |
308 |
309 2 different branches: 2 strips |
309 2 different branches: 2 strips |
310 |
310 |
311 $ hg strip 2 4 |
311 $ hg strip 2 4 |
312 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
312 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
313 saved backup bundle to * (glob) |
313 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
314 saved backup bundle to * (glob) |
314 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
315 $ hg glog |
315 $ hg glog |
316 @ changeset: 2:65bd5f99a4a3 |
316 @ changeset: 2:65bd5f99a4a3 |
317 | tag: tip |
317 | tag: tip |
318 | user: test |
318 | user: test |
319 | date: Thu Jan 01 00:00:00 1970 +0000 |
319 | date: Thu Jan 01 00:00:00 1970 +0000 |
333 |
333 |
334 2 different branches and a common ancestor: 1 strip |
334 2 different branches and a common ancestor: 1 strip |
335 |
335 |
336 $ hg strip 1 2 4 |
336 $ hg strip 1 2 4 |
337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
338 saved backup bundle to * (glob) |
338 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
339 $ restore |
339 $ restore |
340 |
340 |
341 |
341 |
342 remove branchy history for qimport tests |
342 remove branchy history for qimport tests |
343 |
343 |
344 $ hg strip 3 |
344 $ hg strip 3 |
345 saved backup bundle to * (glob) |
345 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
346 |
346 |
347 |
347 |
348 strip of applied mq should cleanup status file |
348 strip of applied mq should cleanup status file |
349 |
349 |
350 $ hg up -C 3 |
350 $ hg up -C 3 |
362 |
362 |
363 stripping revision in queue |
363 stripping revision in queue |
364 |
364 |
365 $ hg strip 3 |
365 $ hg strip 3 |
366 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
366 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
367 saved backup bundle to * (glob) |
367 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
368 |
368 |
369 applied patches after stripping rev in queue |
369 applied patches after stripping rev in queue |
370 |
370 |
371 $ hg qapplied |
371 $ hg qapplied |
372 2.diff |
372 2.diff |
373 |
373 |
374 stripping ancestor of queue |
374 stripping ancestor of queue |
375 |
375 |
376 $ hg strip 1 |
376 $ hg strip 1 |
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 * (glob) |
378 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
379 |
379 |
380 applied patches after stripping ancestor of queue |
380 applied patches after stripping ancestor of queue |
381 |
381 |
382 $ hg qapplied |
382 $ hg qapplied |