Mercurial > evolve
comparison tests/test-prune.t @ 1335:50a40a8cf7be stable
evolve: current bookmark wrongly moving during prune (issue4559)
Before this patch: prune -r <otherbookmark> also moved the current bookmark
eventhough it was not related to the pruned changes.
This patch fixes it and adds a test to catch regressions.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Wed, 13 May 2015 08:47:27 -0700 |
parents | cc3e68120185 |
children | e8e3dbddc198 16017e1bb2a1 |
comparison
equal
deleted
inserted
replaced
1330:efb75f4d55aa | 1335:50a40a8cf7be |
---|---|
286 any known node: 4 | 286 any known node: 4 |
287 smallest length: 1 | 287 smallest length: 1 |
288 longer length: 1 | 288 longer length: 1 |
289 median length: 1 | 289 median length: 1 |
290 mean length: 1 | 290 mean length: 1 |
291 | |
292 $ mkcommit rg | |
293 created new head | |
294 $ hg bookmark rg | |
295 $ hg up 10 | |
296 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
297 (leaving bookmark rg) | |
298 $ hg bookmark r10 | |
299 $ hg log -G | |
300 o 11:cd0038e05e1b[rg] (stable/draft) add rg | |
301 | | |
302 | @ 10:ff43616e5d0f[B r10] (stable/draft) r10 | |
303 |/ | |
304 o 8:d62d843c9a01[] (stable/draft) r8 | |
305 | | |
306 o 7:e7d9710d9fc6[] (stable/draft) r7 | |
307 | | |
308 o 3:2b6d669947cd[] (stable/draft) r3 | |
309 |\ | |
310 | o 2:fa942426a6fd[] (stable/draft) r2 | |
311 | | | |
312 o | 1:66f7d451a68b[] (stable/draft) r1 | |
313 |/ | |
314 o 0:1ea73414a91b[] (stable/draft) r0 | |
315 | |
316 $ hg prune 11 | |
317 1 changesets pruned | |
318 $ hg log -G | |
319 @ 10:ff43616e5d0f[B r10] (stable/draft) r10 | |
320 | | |
321 o 8:d62d843c9a01[rg] (stable/draft) r8 | |
322 | | |
323 o 7:e7d9710d9fc6[] (stable/draft) r7 | |
324 | | |
325 o 3:2b6d669947cd[] (stable/draft) r3 | |
326 |\ | |
327 | o 2:fa942426a6fd[] (stable/draft) r2 | |
328 | | | |
329 o | 1:66f7d451a68b[] (stable/draft) r1 | |
330 |/ | |
331 o 0:1ea73414a91b[] (stable/draft) r0 | |
332 |