Mercurial > evolve
comparison tests/test-prune.t @ 1342:16017e1bb2a1 stable
prune: with active bookmark should stay active
hg prune with an active bookmark was deactivating the bookmark after the prune.
This patch makes sure that if a bookmark was active before a "prune" operation
(except prune -B) then the bookmark stays activate afterwards.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Mon, 18 May 2015 17:24:38 -0700 |
| parents | 50a40a8cf7be |
| children | 376d3df9f47b |
comparison
equal
deleted
inserted
replaced
| 1340:f455ce2a3587 | 1342:16017e1bb2a1 |
|---|---|
| 38 prune current and tip changeset | 38 prune current and tip changeset |
| 39 | 39 |
| 40 $ hg prune --user blah --date '1979-12-15' . | 40 $ hg prune --user blah --date '1979-12-15' . |
| 41 1 changesets pruned | 41 1 changesets pruned |
| 42 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 42 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 43 (leaving bookmark BABAR) | |
| 44 working directory now at 47d2a3944de8 | 43 working directory now at 47d2a3944de8 |
| 44 $ hg bookmark | |
| 45 * BABAR 3:47d2a3944de8 | |
| 45 $ hg debugobsolete | 46 $ hg debugobsolete |
| 46 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'} | 47 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'} |
| 47 | 48 |
| 48 prune leaving instability behind | 49 prune leaving instability behind |
| 49 | 50 |
| 50 $ hg prune 1 | 51 $ hg prune 1 |
| 51 1 changesets pruned | 52 1 changesets pruned |
| 52 2 new unstable changesets | 53 2 new unstable changesets |
| 54 $ hg book -i BABAR | |
| 53 $ hg debugobsolete | 55 $ hg debugobsolete |
| 54 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'} | 56 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'} |
| 55 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob) | 57 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob) |
| 56 | 58 |
| 57 pruning multiple changeset at once | 59 pruning multiple changeset at once |