Mercurial > evolve
annotate tests/test-prune.t @ 4867:769b907e644e mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 27 Sep 2019 13:03:20 +0200 |
parents | c6fc1000af1e 6c02b9ac2832 |
children | f76141f3ce80 1752a2e7a226 |
rev | line source |
---|---|
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
2 > [ui] |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
3 > logtemplate={rev}:{node|short}[{bookmarks}] ({separate('/', obsolete ,phase)}) {desc|firstline}\n |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
4 > [extensions] |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
5 > EOF |
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1756
diff
changeset
|
6 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
7 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
8 $ mkcommit() { |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
9 > echo "$1" > "$1" |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
10 > hg add "$1" |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
11 > hg ci -m "add $1" |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
12 > } |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
13 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
14 $ hg init repo |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
15 $ cd repo |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
16 $ mkcommit a |
686
d15f8a00e4ce
prune: turn one of the test changeset public
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
685
diff
changeset
|
17 $ hg phase --public . |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
18 $ mkcommit b |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 $ mkcommit c |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
20 $ mkcommit d |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 $ mkcommit e |
693
d3c1fe0035d1
prune: handle bookmark
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
692
diff
changeset
|
22 $ hg bookmarks BABAR |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
24 @ 4:9d206ffc875e[BABAR] (draft) add e |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
25 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
26 o 3:47d2a3944de8[] (draft) add d |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
27 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
28 o 2:4538525df7e2[] (draft) add c |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
29 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
30 o 1:7c3bad9141dc[] (draft) add b |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
31 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
32 o 0:1f0dee641bb7[] (public) add a |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
33 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
34 |
1471
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
35 Check arguments exclusive to each other |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
36 --------------------------------------- |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
37 |
4045
821e4be40c6c
prune: replace --biject with --pair
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3663
diff
changeset
|
38 $ hg prune --fold --pair |
821e4be40c6c
prune: replace --biject with --pair
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3663
diff
changeset
|
39 abort: can only specify one of pair, fold |
821e4be40c6c
prune: replace --biject with --pair
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3663
diff
changeset
|
40 [255] |
1471
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
41 $ hg prune --fold --biject |
4795
6c02b9ac2832
prune: adjust 'nothing to prune' to imply user needs to specify revs to prune
Kyle Lippincott <spectral@google.com>
parents:
4702
diff
changeset
|
42 abort: no revisions specified to prune |
1471
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
43 [255] |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
44 $ hg prune --split --fold |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
45 abort: can only specify one of fold, split |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
46 [255] |
4045
821e4be40c6c
prune: replace --biject with --pair
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3663
diff
changeset
|
47 $ hg prune --split --fold --pair |
821e4be40c6c
prune: replace --biject with --pair
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3663
diff
changeset
|
48 abort: can only specify one of pair, fold, split |
821e4be40c6c
prune: replace --biject with --pair
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3663
diff
changeset
|
49 [255] |
1471
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
50 $ hg prune --split --fold --biject |
4045
821e4be40c6c
prune: replace --biject with --pair
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3663
diff
changeset
|
51 abort: can only specify one of fold, split |
1471
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
52 [255] |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
53 |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
54 Check simple case |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
55 ---------------------------- |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
56 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
57 prune current and tip changeset |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
58 |
716
4c0f6d555032
prune: add --user and --date options
Levi Bard <levi@unity3d.com>
parents:
715
diff
changeset
|
59 $ hg prune --user blah --date '1979-12-15' . |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
60 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4613
30a544904238
messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents:
4445
diff
changeset
|
61 working directory is now at 47d2a3944de8 |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
62 1 changesets pruned |
1342
16017e1bb2a1
prune: with active bookmark should stay active
Laurent Charignon <lcharignon@fb.com>
parents:
1335
diff
changeset
|
63 $ hg bookmark |
16017e1bb2a1
prune: with active bookmark should stay active
Laurent Charignon <lcharignon@fb.com>
parents:
1335
diff
changeset
|
64 * BABAR 3:47d2a3944de8 |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
65 $ hg debugobsolete |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
66 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
67 |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
964
diff
changeset
|
68 prune leaving instability behind |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
69 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
70 $ hg prune 1 |
688
f2c3fd21fa63
prune: add an informative message about the number of pruned changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
687
diff
changeset
|
71 1 changesets pruned |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
72 2 new orphan changesets |
1342
16017e1bb2a1
prune: with active bookmark should stay active
Laurent Charignon <lcharignon@fb.com>
parents:
1335
diff
changeset
|
73 $ hg book -i BABAR |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
74 $ hg debugobsolete |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
75 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
76 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
77 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
78 pruning multiple changeset at once |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
79 |
2442
a8fea2ae3c0b
prune: prevent a color related crash when the working copy is moved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
80 (add color output to test it does not crash) |
a8fea2ae3c0b
prune: prevent a color related crash when the working copy is moved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
81 |
a8fea2ae3c0b
prune: prevent a color related crash when the working copy is moved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
82 $ hg prune 2: --color debug |
a8fea2ae3c0b
prune: prevent a color related crash when the working copy is moved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
83 [ ui.status|0 files updated, 0 files merged, 3 files removed, 0 files unresolved] |
4613
30a544904238
messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents:
4445
diff
changeset
|
84 [ ui.status|working directory is now at [evolve.node|1f0dee641bb7]] |
2442
a8fea2ae3c0b
prune: prevent a color related crash when the working copy is moved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
85 [ ui.status|2 changesets pruned] |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
86 $ hg debugobsolete |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
87 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
88 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
89 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
90 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
91 |
687
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
686
diff
changeset
|
92 cannot prune public changesets |
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
686
diff
changeset
|
93 |
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
686
diff
changeset
|
94 $ hg prune 0 |
4445
0f2305921e4d
prune: use action "prune", not "touch", in precheck
Martin von Zweigbergk <martinvonz@google.com>
parents:
4045
diff
changeset
|
95 abort: cannot prune public changesets: 1f0dee641bb7 |
1756
a7dcfff8c4a9
evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
1732
diff
changeset
|
96 (see 'hg help phases' for details) |
687
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
686
diff
changeset
|
97 [255] |
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
686
diff
changeset
|
98 $ hg debugobsolete |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
99 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
100 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
101 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
102 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
687
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
686
diff
changeset
|
103 |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
104 Check successors addition |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
105 ---------------------------- |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
106 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
107 $ mkcommit bb |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
108 $ mkcommit cc |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
109 $ mkcommit dd |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
110 $ mkcommit ee |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
111 $ hg up 0 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
112 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
113 $ mkcommit nB |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
114 created new head |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
115 $ mkcommit nC |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
116 $ mkcommit nD |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
117 $ mkcommit nE |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
118 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
119 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
120 @ 12:6e8148413dd5[] (draft) add nE |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
121 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
122 o 11:8ee176ff1d4b[] (draft) add nD |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
123 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
124 o 10:aa96dc3f04c2[] (draft) add nC |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
125 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
126 o 9:6f6f25e4f748[] (draft) add nB |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
127 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
128 | o 8:bb5e90a7ea1f[] (draft) add ee |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
129 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
130 | o 7:00ded550b1e2[] (draft) add dd |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
131 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
132 | o 6:354011cd103f[] (draft) add cc |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
133 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
134 | o 5:814c38b95e72[] (draft) add bb |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
135 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
136 o 0:1f0dee641bb7[BABAR] (public) add a |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
137 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
138 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
139 one old, one new |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
140 |
931
32915143d448
prune: update to successor rather than parent when prune '.'
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
902
diff
changeset
|
141 $ hg up 'desc("add ee")' |
32915143d448
prune: update to successor rather than parent when prune '.'
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
902
diff
changeset
|
142 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
143 $ hg prune 'desc("add ee")' -s 'desc("add nE")' |
931
32915143d448
prune: update to successor rather than parent when prune '.'
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
902
diff
changeset
|
144 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
4613
30a544904238
messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents:
4445
diff
changeset
|
145 working directory is now at 6e8148413dd5 |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
146 1 changesets pruned |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
147 $ hg debugobsolete |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
148 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
149 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
150 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
151 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
152 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
153 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
154 @ 12:6e8148413dd5[] (draft) add nE |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
155 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
156 o 11:8ee176ff1d4b[] (draft) add nD |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
157 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
158 o 10:aa96dc3f04c2[] (draft) add nC |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
159 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
160 o 9:6f6f25e4f748[] (draft) add nB |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
161 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
162 | o 7:00ded550b1e2[] (draft) add dd |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
163 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
164 | o 6:354011cd103f[] (draft) add cc |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
165 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
166 | o 5:814c38b95e72[] (draft) add bb |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
167 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
168 o 0:1f0dee641bb7[BABAR] (public) add a |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
169 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
170 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
171 one old, two new |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
172 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
173 $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' |
1471
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
174 abort: please add --split if you want to do a split |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
175 [255] |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
176 $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' --split |
688
f2c3fd21fa63
prune: add an informative message about the number of pruned changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
687
diff
changeset
|
177 1 changesets pruned |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
178 $ hg debugobsolete |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
179 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
180 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
181 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
182 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
183 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
184 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
185 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
186 @ 12:6e8148413dd5[] (draft) add nE |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
187 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
188 o 11:8ee176ff1d4b[] (draft) add nD |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
189 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
190 o 10:aa96dc3f04c2[] (draft) add nC |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
191 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
192 o 9:6f6f25e4f748[] (draft) add nB |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
193 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
194 | o 6:354011cd103f[] (draft) add cc |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
195 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
196 | o 5:814c38b95e72[] (draft) add bb |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
197 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
198 o 0:1f0dee641bb7[BABAR] (public) add a |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
199 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
200 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
201 two old, two new (should be denied) |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
202 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
203 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")' |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
204 abort: Can't use multiple successors for multiple precursors |
4045
821e4be40c6c
prune: replace --biject with --pair
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3663
diff
changeset
|
205 (use --pair to mark a series as a replacement for another) |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
206 [255] |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
207 $ hg debugobsolete |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
208 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
209 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
210 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
211 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
212 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
213 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
214 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
215 two old, one new: |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
216 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
217 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")' |
1471
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
218 abort: please add --fold if you want to do a fold |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
219 [255] |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
220 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")' --fold |
688
f2c3fd21fa63
prune: add an informative message about the number of pruned changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
687
diff
changeset
|
221 2 changesets pruned |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
222 $ hg debugobsolete |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
223 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
224 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
225 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
226 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
227 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
228 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
229 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
230 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
231 |
4698
b89495215c6e
tests: demonstrate prune --pair not moving bookmark correctly
Anton Shestakov <av6@dwimlabs.net>
parents:
4613
diff
changeset
|
232 two old, two new with --pair (also test bookmark move) |
789
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
233 |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
234 $ hg up 0 |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
235 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
4698
b89495215c6e
tests: demonstrate prune --pair not moving bookmark correctly
Anton Shestakov <av6@dwimlabs.net>
parents:
4613
diff
changeset
|
236 $ hg bookmark prune-pair-book |
789
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
237 $ mkcommit n1 |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
238 created new head |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
239 $ mkcommit n2 |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
240 |
4045
821e4be40c6c
prune: replace --biject with --pair
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3663
diff
changeset
|
241 $ hg prune 'desc("add n1")::desc("add n2")' -s 'desc("add nD")::desc("add nE")' --pair |
4699
dfd88e3fa90a
prune: update to the successor of wdir also with --pair/--biject (issue6142)
Anton Shestakov <av6@dwimlabs.net>
parents:
4698
diff
changeset
|
242 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
dfd88e3fa90a
prune: update to the successor of wdir also with --pair/--biject (issue6142)
Anton Shestakov <av6@dwimlabs.net>
parents:
4698
diff
changeset
|
243 working directory is now at 6e8148413dd5 |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
244 2 changesets pruned |
789
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
245 $ hg debugobsolete |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
246 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
247 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
248 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
249 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
250 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
251 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
252 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
253 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
254 cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
255 21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
4698
b89495215c6e
tests: demonstrate prune --pair not moving bookmark correctly
Anton Shestakov <av6@dwimlabs.net>
parents:
4613
diff
changeset
|
256 $ hg log --hidden -r 'desc("add n2") + desc("add nE") + bookmark("prune-pair-book")' |
b89495215c6e
tests: demonstrate prune --pair not moving bookmark correctly
Anton Shestakov <av6@dwimlabs.net>
parents:
4613
diff
changeset
|
257 14:21b6f2f1cece[] (obsolete/draft) add n2 |
4699
dfd88e3fa90a
prune: update to the successor of wdir also with --pair/--biject (issue6142)
Anton Shestakov <av6@dwimlabs.net>
parents:
4698
diff
changeset
|
258 12:6e8148413dd5[prune-pair-book] (draft) add nE |
789
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
259 |
1220
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
260 test hg strip replacement |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
261 |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
262 $ hg up 10 |
4699
dfd88e3fa90a
prune: update to the successor of wdir also with --pair/--biject (issue6142)
Anton Shestakov <av6@dwimlabs.net>
parents:
4698
diff
changeset
|
263 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
4698
b89495215c6e
tests: demonstrate prune --pair not moving bookmark correctly
Anton Shestakov <av6@dwimlabs.net>
parents:
4613
diff
changeset
|
264 (leaving bookmark prune-pair-book) |
1220
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
265 $ mkcommit n1 |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
266 created new head |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
267 $ mkcommit n2 |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
268 $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r . |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
269 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4613
30a544904238
messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents:
4445
diff
changeset
|
270 working directory is now at c7e58696a948 |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
271 1 changesets pruned |
1220
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
272 $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r . --bundle |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
273 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
274 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/c7e58696a948-69ca36d3-backup.hg (glob) |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
275 |
1221
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
276 test hg prune --keep |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
277 $ mkcommit n1 |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
278 created new head |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
279 $ hg diff -r .^ |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
280 diff -r aa96dc3f04c2 n1 |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
281 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
282 +++ b/n1 * +0000 (glob) |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
283 @@ -0,0 +1,1 @@ |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
284 +n1 |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
285 $ hg prune -r . --keep |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
286 1 changesets pruned |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
287 $ hg status |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
288 ? n1 |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
289 |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
290 test hg prune -B bookmark |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
291 yoinked from test-mq-strip.t |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
292 |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
293 $ cd .. |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
294 $ hg init bookmarks |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
295 $ cd bookmarks |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
296 $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b<m+2:d<2.:e<m+1:f' |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
297 $ hg bookmark -r 'a' 'todelete' |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
298 $ hg bookmark -r 'b' 'B' |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
299 $ hg bookmark -r 'b' 'nostrip' |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
300 $ hg bookmark -r 'c' 'delete' |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
301 $ hg bookmark -r 'd' 'multipledelete1' |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
302 $ hg bookmark -r 'e' 'multipledelete2' |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
303 $ hg bookmark -r 'f' 'singlenode1' |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
304 $ hg bookmark -r 'f' 'singlenode2' |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
305 $ hg up -C todelete |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
306 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
964
c768f7666106
test: update to output change introduced by future 3.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
932
diff
changeset
|
307 (activating bookmark todelete) |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
308 $ hg prune -B nostrip |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
309 bookmark 'nostrip' deleted |
4795
6c02b9ac2832
prune: adjust 'nothing to prune' to imply user needs to specify revs to prune
Kyle Lippincott <spectral@google.com>
parents:
4702
diff
changeset
|
310 abort: no revisions specified to prune |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
311 [255] |
902
69872cef6053
tests: fix test-prune.t breakage
Durham Goode <durham@fb.com>
parents:
789
diff
changeset
|
312 $ hg tag --remove --local a |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
313 $ hg prune -B todelete |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
314 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
964
c768f7666106
test: update to output change introduced by future 3.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
932
diff
changeset
|
315 (leaving bookmark todelete) |
4613
30a544904238
messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents:
4445
diff
changeset
|
316 working directory is now at d62d843c9a01 |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
317 bookmark 'todelete' deleted |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
318 1 changesets pruned |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
319 $ hg id -ir dcbb326fdec2 |
3663
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3566
diff
changeset
|
320 abort: hidden revision 'dcbb326fdec2' is pruned! |
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3566
diff
changeset
|
321 (use --hidden to access hidden revisions) |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
322 [255] |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
323 $ hg id -ir d62d843c9a01 |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
324 d62d843c9a01 |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
325 $ hg bookmarks |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
326 B 10:ff43616e5d0f |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
327 delete 6:2702dd0c91e7 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
328 multipledelete1 12:e46a4836065c |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
329 multipledelete2 13:b4594d867745 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
330 singlenode1 14:43227190fef8 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
331 singlenode2 14:43227190fef8 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
332 $ hg prune -B multipledelete1 -B multipledelete2 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
333 bookmark 'multipledelete1' deleted |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
334 bookmark 'multipledelete2' deleted |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
335 2 changesets pruned |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
336 $ hg prune -B singlenode1 -B singlenode2 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
337 bookmark 'singlenode1' deleted |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
338 bookmark 'singlenode2' deleted |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
339 1 changesets pruned |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
340 $ hg prune -B unknownbookmark |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
341 abort: bookmark 'unknownbookmark' not found |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
342 [255] |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
343 $ hg prune -B unknownbookmark1 -B unknownbookmark2 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
344 abort: bookmark 'unknownbookmark1,unknownbookmark2' not found |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
345 [255] |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
346 $ hg prune -B delete -B unknownbookmark |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
347 abort: bookmark 'unknownbookmark' not found |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
348 [255] |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
349 $ hg prune -B delete |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
350 bookmark 'delete' deleted |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
351 3 changesets pruned |
902
69872cef6053
tests: fix test-prune.t breakage
Durham Goode <durham@fb.com>
parents:
789
diff
changeset
|
352 $ hg tag --remove --local c |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
353 $ hg id -ir 6:2702dd0c91e7 |
3663
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3566
diff
changeset
|
354 abort: hidden revision '6' is pruned! |
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3566
diff
changeset
|
355 (use --hidden to access hidden revisions) |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
356 [255] |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
357 |
810
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
358 $ hg debugobsstorestat |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
359 markers total: 7 |
2547
3c594000844b
debugobsstorestat: adds static about actually obsolete changeses
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2445
diff
changeset
|
360 for known precursors: 7 (7/15 obsolete changesets) |
813
b49a9276ec8e
test-prune: update test with a prune output compatible with newest hg
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
810
diff
changeset
|
361 with parents data: [04] (re) |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
362 markers with no successors: 7 |
810
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
363 1 successors: 0 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
364 2 successors: 0 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
365 more than 2 successors: 0 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
366 available keys: |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
367 ef1: 7 |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
368 operation: 7 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
369 user: 7 |
2440
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
370 marker size: |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
371 format v1: |
3566
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
372 smallest length: 91 |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
373 longer length: 91 |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
374 median length: 91 |
e6bea259c227
prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
375 mean length: 91 |
2440
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
376 format v0: |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
377 smallest length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
378 longer length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
379 median length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
380 mean length: * (glob) |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
381 disconnected clusters: 7 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
382 any known node: 7 |
810
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
383 smallest length: 1 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
384 longer length: 1 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
385 median length: 1 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
386 mean length: 1 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
387 using parents data: 7 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
388 any known node: 7 |
810
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
389 smallest length: 1 |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
390 longer length: 1 |
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
391 median length: 1 |
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
392 mean length: 1 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
393 |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
394 $ mkcommit rg |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
395 created new head |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
396 $ hg bookmark rg |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
397 $ hg up 10 |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
398 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
399 (leaving bookmark rg) |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
400 $ hg bookmark r10 |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
401 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
402 o 15:cd0038e05e1b[rg] (draft) add rg |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
403 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
404 | x 14:43227190fef8[] (obsolete/draft) r14 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
405 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
406 | | x 13:b4594d867745[] (obsolete/draft) r13 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
407 | | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
408 | | | x 12:e46a4836065c[] (obsolete/draft) r12 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
409 | | |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
410 | | o 11:bab5d5bf48bd[] (draft) r11 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
411 | |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
412 +---@ 10:ff43616e5d0f[B r10] (draft) r10 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
413 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
414 o | 8:d62d843c9a01[] (draft) r8 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
415 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
416 o | 7:e7d9710d9fc6[] (draft) r7 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
417 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
418 o 3:2b6d669947cd[] (draft) r3 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
419 |\ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
420 | o 2:fa942426a6fd[] (draft) r2 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
421 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
422 o | 1:66f7d451a68b[] (draft) r1 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
423 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
424 o 0:1ea73414a91b[] (draft) r0 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
425 |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
426 $ hg prune 11 |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
427 1 changesets pruned |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
428 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
429 o 15:cd0038e05e1b[rg] (draft) add rg |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
430 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
431 | x 14:43227190fef8[] (obsolete/draft) r14 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
432 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
433 | | x 13:b4594d867745[] (obsolete/draft) r13 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
434 | | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
435 | | | x 12:e46a4836065c[] (obsolete/draft) r12 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
436 | | |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
437 | | x 11:bab5d5bf48bd[] (obsolete/draft) r11 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
438 | |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
439 +---@ 10:ff43616e5d0f[B r10] (draft) r10 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
440 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
441 o | 8:d62d843c9a01[] (draft) r8 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
442 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
443 o | 7:e7d9710d9fc6[] (draft) r7 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
444 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
445 o 3:2b6d669947cd[] (draft) r3 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
446 |\ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
447 | o 2:fa942426a6fd[] (draft) r2 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
448 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
449 o | 1:66f7d451a68b[] (draft) r1 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
450 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
451 o 0:1ea73414a91b[] (draft) r0 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
452 |
1345
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
453 $ hg book CELESTE |
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
454 $ hg prune -r . --keep |
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
455 1 changesets pruned |
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
456 $ hg book |
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
457 B 8:d62d843c9a01 |
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
458 * CELESTE 8:d62d843c9a01 |
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
459 r10 8:d62d843c9a01 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
460 rg 15:cd0038e05e1b |
1345
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
461 |
4701
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
462 $ cd .. |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
463 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
464 Test that prune doesn't update off when pruning unrelated commit (issue6137) |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
465 ---------------------------------------------------------------------------- |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
466 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
467 $ hg init issue6137 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
468 $ cd issue6137 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
469 $ echo a > a |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
470 $ hg ci -Aqm "added a" |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
471 $ echo b > b |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
472 $ hg ci -Aqm "added b" |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
473 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
474 $ hg prune . |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
475 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
476 working directory is now at 9092f1db7931 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
477 1 changesets pruned |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
478 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
479 $ echo c > c |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
480 $ hg ci -Aqm "added c" |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
481 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
482 update to obsoleted revision and perform prune on unrelated revision: |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
483 $ hg up -r "desc('added b')" --hidden -q |
4772
c6fc1000af1e
test-compat: merge mercurial-4.7 into mercurial-4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4702
diff
changeset
|
484 updating to a hidden changeset 5f6d8a4bf34a |
4701
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
485 (hidden revision '5f6d8a4bf34a' is pruned) |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
486 working directory parent is obsolete! (5f6d8a4bf34a) |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
487 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
488 $ hg log -G |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
489 o 2:29edef26570b[] (draft) added c |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
490 | |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
491 | @ 1:5f6d8a4bf34a[] (obsolete/draft) added b |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
492 |/ |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
493 o 0:9092f1db7931[] (draft) added a |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
494 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
495 $ hg prune -r "desc('added c')" |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
496 1 changesets pruned |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
497 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
498 $ hg par |
4702
fcecbb1261f2
evolve: fix the inconsistent behaviour of prune (issue6137)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4701
diff
changeset
|
499 1:5f6d8a4bf34a[] (obsolete/draft) added b |
fcecbb1261f2
evolve: fix the inconsistent behaviour of prune (issue6137)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4701
diff
changeset
|
500 working directory parent is obsolete! (5f6d8a4bf34a) |
fcecbb1261f2
evolve: fix the inconsistent behaviour of prune (issue6137)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4701
diff
changeset
|
501 (use 'hg evolve' to update to its parent successor) |
4701
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
502 |
1b5da965d72a
prune: add tests to demonstrate issue6137
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4699
diff
changeset
|
503 $ cd .. |