36 Check simple case |
36 Check simple case |
37 ---------------------------- |
37 ---------------------------- |
38 |
38 |
39 prune current and tip changeset |
39 prune current and tip changeset |
40 |
40 |
41 $ hg prune . |
41 $ hg prune --user blah --date '1979-12-15' . |
42 1 changesets pruned |
42 1 changesets pruned |
43 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
43 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
44 working directory now at 47d2a3944de8 |
44 working directory now at 47d2a3944de8 |
45 $ hg debugobsolete |
45 $ hg debugobsolete |
46 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) |
46 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', 'user': 'blah'} (glob) |
47 |
47 |
48 prune leaving unstability behind |
48 prune leaving unstability behind |
49 |
49 |
50 $ hg prune 1 |
50 $ hg prune 1 |
51 1 changesets pruned |
51 1 changesets pruned |
52 2 new unstable changesets |
52 2 new unstable changesets |
53 $ hg debugobsolete |
53 $ hg debugobsolete |
54 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) |
54 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', 'user': 'blah'} (glob) |
55 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
55 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
56 |
56 |
57 pruning multiple changeset at once |
57 pruning multiple changeset at once |
58 |
58 |
59 $ hg prune 2: |
59 $ hg prune 2: |
60 2 changesets pruned |
60 2 changesets pruned |
61 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
61 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
62 working directory now at 1f0dee641bb7 |
62 working directory now at 1f0dee641bb7 |
63 $ hg debugobsolete |
63 $ hg debugobsolete |
64 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) |
64 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', 'user': 'blah'} (glob) |
65 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
65 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
66 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
66 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
67 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
67 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
68 |
68 |
69 cannot prune public changesets |
69 cannot prune public changesets |
71 $ hg prune 0 |
71 $ hg prune 0 |
72 abort: cannot prune immutable changeset: 1f0dee641bb7 |
72 abort: cannot prune immutable changeset: 1f0dee641bb7 |
73 (see "hg help phases" for details) |
73 (see "hg help phases" for details) |
74 [255] |
74 [255] |
75 $ hg debugobsolete |
75 $ hg debugobsolete |
76 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) |
76 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', 'user': 'blah'} (glob) |
77 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
77 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
78 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
78 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
79 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
79 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
80 |
80 |
81 Check successors addition |
81 Check successors addition |
116 one old, one new |
116 one old, one new |
117 |
117 |
118 $ hg prune 'desc("add ee")' -s 'desc("add nE")' |
118 $ hg prune 'desc("add ee")' -s 'desc("add nE")' |
119 1 changesets pruned |
119 1 changesets pruned |
120 $ hg debugobsolete |
120 $ hg debugobsolete |
121 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) |
121 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', 'user': 'blah'} (glob) |
122 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
122 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
123 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
123 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
124 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
124 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
125 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob) |
125 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob) |
126 $ hg log -G |
126 $ hg log -G |
144 one old, two new |
144 one old, two new |
145 |
145 |
146 $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' |
146 $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' |
147 1 changesets pruned |
147 1 changesets pruned |
148 $ hg debugobsolete |
148 $ hg debugobsolete |
149 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) |
149 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', 'user': 'blah'} (glob) |
150 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
150 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
151 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
151 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
152 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
152 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
153 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob) |
153 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob) |
154 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '**', 'user': 'test'} (glob) |
154 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '**', 'user': 'test'} (glob) |
172 |
172 |
173 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")' |
173 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")' |
174 abort: Can't use multiple successors for multiple precursors |
174 abort: Can't use multiple successors for multiple precursors |
175 [255] |
175 [255] |
176 $ hg debugobsolete |
176 $ hg debugobsolete |
177 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) |
177 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', 'user': 'blah'} (glob) |
178 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
178 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
179 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
179 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
180 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
180 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
181 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob) |
181 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob) |
182 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '**', 'user': 'test'} (glob) |
182 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '**', 'user': 'test'} (glob) |
184 two old, one new: |
184 two old, one new: |
185 |
185 |
186 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")' |
186 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")' |
187 2 changesets pruned |
187 2 changesets pruned |
188 $ hg debugobsolete |
188 $ hg debugobsolete |
189 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) |
189 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', 'user': 'blah'} (glob) |
190 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
190 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) |
191 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
191 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) |
192 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
192 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) |
193 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob) |
193 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob) |
194 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '**', 'user': 'test'} (glob) |
194 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '**', 'user': 'test'} (glob) |
195 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 {'date': '*', 'user': 'test'} (glob) |
195 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 {'date': '*', 'user': 'test'} (glob) |
196 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 {'date': '*', 'user': 'test'} (glob) |
196 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 {'date': '*', 'user': 'test'} (glob) |
|
197 |
|
198 test hg prune -B bookmark |
|
199 yoinked from test-mq-strip.t |
|
200 |
|
201 $ cd .. |
|
202 $ hg init bookmarks |
|
203 $ cd bookmarks |
|
204 $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b' |
|
205 $ hg bookmark -r 'a' 'todelete' |
|
206 $ hg bookmark -r 'b' 'B' |
|
207 $ hg bookmark -r 'b' 'nostrip' |
|
208 $ hg bookmark -r 'c' 'delete' |
|
209 $ hg up -C todelete |
|
210 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
211 $ hg prune -B nostrip |
|
212 bookmark 'nostrip' deleted |
|
213 abort: nothing to prune |
|
214 [255] |
|
215 $ hg prune -B todelete |
|
216 1 changesets pruned |
|
217 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
218 working directory now at d62d843c9a01 |
|
219 bookmark 'todelete' deleted |
|
220 $ hg id -ir dcbb326fdec2 |
|
221 abort: 00changelog.i@dcbb326fdec2*: no node! (glob) |
|
222 [255] |
|
223 $ hg id -ir d62d843c9a01 |
|
224 d62d843c9a01 |
|
225 $ hg bookmarks |
|
226 B 10:ff43616e5d0f |
|
227 delete 6:2702dd0c91e7 |
|
228 $ hg prune -B delete |
|
229 3 changesets pruned |
|
230 bookmark 'delete' deleted |
|
231 $ hg id -ir 6:2702dd0c91e7 |
|
232 abort: 00changelog.i@2702dd0c91e7*: no node! (glob) |
|
233 [255] |
|
234 |