comparison tests/test-prune.t @ 1344:376d3df9f47b

Merge with stable
author Laurent Charignon <lcharignon@fb.com>
date Wed, 20 May 2015 13:23:20 -0700
parents e8e3dbddc198 16017e1bb2a1
children 37c505975e28
comparison
equal deleted inserted replaced
1343:41628bd60ee6 1344:376d3df9f47b
37 37
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 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 41 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
42 (leaving bookmark BABAR)
43 working directory now at 47d2a3944de8 42 working directory now at 47d2a3944de8
44 1 changesets pruned 43 1 changesets pruned
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