Mercurial > evolve
annotate tests/test-prune.t @ 2583:3312f9404c00
effectflag: activate effect flag on test-uncommit.t test file
Prepare activation of effect flag by default by activating it on test-
uncommit.t test file first.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Sun, 04 Jun 2017 21:35:17 +0200 |
parents | 8c25b4e92212 |
children | cbc7a69116bd |
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 |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
4 > [experimental] |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
5 > evolution.effect-flags = yes |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
6 > [extensions] |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
7 > EOF |
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1756
diff
changeset
|
8 $ 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
|
9 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
10 $ mkcommit() { |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
11 > echo "$1" > "$1" |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
12 > hg add "$1" |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
13 > hg ci -m "add $1" |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
14 > } |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
15 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
16 $ hg init repo |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 $ cd repo |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
18 $ 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
|
19 $ hg phase --public . |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
20 $ mkcommit b |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 $ mkcommit c |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 $ mkcommit d |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 $ mkcommit e |
693
d3c1fe0035d1
prune: handle bookmark
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
692
diff
changeset
|
24 $ hg bookmarks BABAR |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
25 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
26 @ 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
|
27 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
28 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
|
29 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
30 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
|
31 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
32 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
|
33 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
34 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
|
35 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
36 |
1471
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
37 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
|
38 --------------------------------------- |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
39 |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
40 $ hg prune --fold --biject |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
41 abort: can only specify one of biject, fold |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
42 [255] |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
43 $ hg prune --split --fold |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
44 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
|
45 [255] |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
46 $ hg prune --split --fold --biject |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
47 abort: can only specify one of biject, fold, split |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
48 [255] |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
49 |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
50 Check simple case |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
51 ---------------------------- |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
52 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
53 prune current and tip changeset |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
54 |
716
4c0f6d555032
prune: add --user and --date options
Levi Bard <levi@unity3d.com>
parents:
715
diff
changeset
|
55 $ 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
|
56 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
57 working directory now at 47d2a3944de8 |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
58 1 changesets pruned |
1342
16017e1bb2a1
prune: with active bookmark should stay active
Laurent Charignon <lcharignon@fb.com>
parents:
1335
diff
changeset
|
59 $ hg bookmark |
16017e1bb2a1
prune: with active bookmark should stay active
Laurent Charignon <lcharignon@fb.com>
parents:
1335
diff
changeset
|
60 * BABAR 3:47d2a3944de8 |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
61 $ hg debugobsolete |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
62 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob) |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
63 |
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
964
diff
changeset
|
64 prune leaving instability behind |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
65 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
66 $ 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
|
67 1 changesets pruned |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
68 2 new unstable changesets |
1342
16017e1bb2a1
prune: with active bookmark should stay active
Laurent Charignon <lcharignon@fb.com>
parents:
1335
diff
changeset
|
69 $ hg book -i BABAR |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
70 $ hg debugobsolete |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
71 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
72 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob) |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
73 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
74 pruning multiple changeset at once |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
75 |
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
|
76 (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
|
77 |
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
|
78 $ 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
|
79 [ ui.status|0 files updated, 0 files merged, 3 files removed, 0 files unresolved] |
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 [ ui.status|working directory now at [evolve.node|1f0dee641bb7]] |
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 [ 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
|
82 $ hg debugobsolete |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
83 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
84 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
85 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
86 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob) |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
87 |
687
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
686
diff
changeset
|
88 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
|
89 |
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
686
diff
changeset
|
90 $ hg prune 0 |
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
686
diff
changeset
|
91 abort: cannot prune immutable changeset: 1f0dee641bb7 |
1756
a7dcfff8c4a9
evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
1732
diff
changeset
|
92 (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
|
93 [255] |
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
686
diff
changeset
|
94 $ hg debugobsolete |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
95 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
96 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
97 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
98 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob) |
687
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
686
diff
changeset
|
99 |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
100 Check successors addition |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
101 ---------------------------- |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
102 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
103 $ mkcommit bb |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
104 $ mkcommit cc |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
105 $ mkcommit dd |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
106 $ mkcommit ee |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
107 $ hg up 0 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
108 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
|
109 $ mkcommit nB |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
110 created new head |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
111 $ mkcommit nC |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
112 $ mkcommit nD |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
113 $ mkcommit nE |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
114 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
115 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
116 @ 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
|
117 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
118 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
|
119 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
120 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
|
121 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
122 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
|
123 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
124 | 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
|
125 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
126 | 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
|
127 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
128 | 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
|
129 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
130 | 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
|
131 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
132 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
|
133 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
134 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
135 one old, one new |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
136 |
931
32915143d448
prune: update to successor rather than parent when prune '.'
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
902
diff
changeset
|
137 $ 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
|
138 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
|
139 $ 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
|
140 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
32915143d448
prune: update to successor rather than parent when prune '.'
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents:
902
diff
changeset
|
141 working directory now at 6e8148413dd5 |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
142 1 changesets pruned |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
143 $ hg debugobsolete |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
144 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
145 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
146 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
147 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
148 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
149 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
150 @ 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
|
151 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
152 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
|
153 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
154 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
|
155 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
156 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
|
157 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
158 | 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
|
159 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
160 | 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
|
161 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
162 | 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
|
163 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
164 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
|
165 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
166 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
167 one old, two new |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
168 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
169 $ 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
|
170 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
|
171 [255] |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
172 $ 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
|
173 1 changesets pruned |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
174 $ hg debugobsolete |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
175 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
176 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
177 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
178 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
179 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
180 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
181 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
182 @ 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
|
183 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
184 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
|
185 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
186 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
|
187 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
188 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
|
189 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
190 | 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
|
191 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
192 | 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
|
193 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
194 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
|
195 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
196 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
197 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
|
198 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
199 $ 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
|
200 abort: Can't use multiple successors for multiple precursors |
1689
60752ed8d2d4
prune: suggest --biject in error "hint"
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1564
diff
changeset
|
201 (use --biject 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
|
202 [255] |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
203 $ hg debugobsolete |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
204 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
205 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
206 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
207 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
208 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
209 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
210 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
211 two old, one new: |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
212 |
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
213 $ 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
|
214 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
|
215 [255] |
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1345
diff
changeset
|
216 $ 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
|
217 2 changesets pruned |
685
7398f9729821
prune: add test and more robusness
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
218 $ hg debugobsolete |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
219 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
220 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
221 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
222 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
223 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
224 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
225 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
226 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
227 |
789
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
228 two old, two new with --biject |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
229 |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
230 $ hg up 0 |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
231 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
232 $ mkcommit n1 |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
233 created new head |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
234 $ mkcommit n2 |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
235 |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
236 $ hg prune 'desc("add n1")::desc("add n2")' -s 'desc("add nD")::desc("add nE")' --biject |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
237 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
238 working directory now at 1f0dee641bb7 |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
239 2 changesets pruned |
789
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
240 $ hg debugobsolete |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
241 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
242 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
243 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
244 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
245 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
246 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
247 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
248 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
249 cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
250 21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
789
0d2bb0282e78
prune: add biject option
Sean Farley <sean.michael.farley@gmail.com>
parents:
740
diff
changeset
|
251 |
1220
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
252 test hg strip replacement |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
253 |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
254 $ hg up 10 |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
255 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
256 $ mkcommit n1 |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
257 created new head |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
258 $ mkcommit n2 |
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
259 $ 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
|
260 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
|
261 working directory now at c7e58696a948 |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
262 1 changesets pruned |
1220
71240f696f26
strip: add the option for wrapping the strip command
Durham Goode <durham@fb.com>
parents:
1185
diff
changeset
|
263 $ 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
|
264 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
|
265 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
|
266 |
1221
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
267 test hg prune --keep |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
268 $ mkcommit n1 |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
269 created new head |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
270 $ hg diff -r .^ |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
271 diff -r aa96dc3f04c2 n1 |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
272 --- /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
|
273 +++ b/n1 * +0000 (glob) |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
274 @@ -0,0 +1,1 @@ |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
275 +n1 |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
276 $ hg prune -r . --keep |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
277 1 changesets pruned |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
278 $ hg status |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
279 ? n1 |
524dbc8ffeac
prune: add --keep to not touch the working copy
Durham Goode <durham@fb.com>
parents:
1220
diff
changeset
|
280 |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
281 test hg prune -B bookmark |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
282 yoinked from test-mq-strip.t |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
283 |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
284 $ cd .. |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
285 $ hg init bookmarks |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
286 $ cd bookmarks |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
287 $ 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
|
288 $ hg bookmark -r 'a' 'todelete' |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
289 $ hg bookmark -r 'b' 'B' |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
290 $ hg bookmark -r 'b' 'nostrip' |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
291 $ 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
|
292 $ hg bookmark -r 'd' 'multipledelete1' |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
293 $ hg bookmark -r 'e' 'multipledelete2' |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
294 $ hg bookmark -r 'f' 'singlenode1' |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
295 $ hg bookmark -r 'f' 'singlenode2' |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
296 $ hg up -C todelete |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
297 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
|
298 (activating bookmark todelete) |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
299 $ hg prune -B nostrip |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
300 bookmark 'nostrip' deleted |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
301 abort: nothing to prune |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
302 [255] |
902
69872cef6053
tests: fix test-prune.t breakage
Durham Goode <durham@fb.com>
parents:
789
diff
changeset
|
303 $ hg tag --remove --local a |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
304 $ hg prune -B todelete |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
305 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
|
306 (leaving bookmark todelete) |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
307 working directory now at d62d843c9a01 |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
308 bookmark 'todelete' deleted |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
309 1 changesets pruned |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
310 $ hg id -ir dcbb326fdec2 |
1133
8b3b0549a4b6
test: adapt to new hidden-changeset message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1128
diff
changeset
|
311 abort: hidden revision 'dcbb326fdec2'! |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
312 (use --hidden to access hidden revisions; pruned) |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
313 [255] |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
314 $ hg id -ir d62d843c9a01 |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
315 d62d843c9a01 |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
316 $ hg bookmarks |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
317 B 10:ff43616e5d0f |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
318 delete 6:2702dd0c91e7 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
319 multipledelete1 12:e46a4836065c |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
320 multipledelete2 13:b4594d867745 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
321 singlenode1 14:43227190fef8 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
322 singlenode2 14:43227190fef8 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
323 $ 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
|
324 bookmark 'multipledelete1' deleted |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
325 bookmark 'multipledelete2' deleted |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
326 2 changesets pruned |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
327 $ 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
|
328 bookmark 'singlenode1' deleted |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
329 bookmark 'singlenode2' deleted |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
330 1 changesets pruned |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
331 $ hg prune -B unknownbookmark |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
332 abort: bookmark 'unknownbookmark' not found |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
333 [255] |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
334 $ 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
|
335 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
|
336 [255] |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
337 $ 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
|
338 abort: bookmark 'unknownbookmark' not found |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
339 [255] |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
340 $ hg prune -B delete |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1221
diff
changeset
|
341 bookmark 'delete' deleted |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
342 3 changesets pruned |
902
69872cef6053
tests: fix test-prune.t breakage
Durham Goode <durham@fb.com>
parents:
789
diff
changeset
|
343 $ hg tag --remove --local c |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
344 $ hg id -ir 6:2702dd0c91e7 |
1133
8b3b0549a4b6
test: adapt to new hidden-changeset message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1128
diff
changeset
|
345 abort: hidden revision '6'! |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
346 (use --hidden to access hidden revisions; pruned) |
715
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
347 [255] |
070bbbb0e6f2
prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents:
693
diff
changeset
|
348 |
810
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
349 $ hg debugobsstorestat |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
350 markers total: 7 |
2547
3c594000844b
debugobsstorestat: adds static about actually obsolete changeses
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2445
diff
changeset
|
351 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
|
352 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
|
353 markers with no successors: 7 |
810
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
354 1 successors: 0 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
355 2 successors: 0 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
356 more than 2 successors: 0 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
357 available keys: |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
358 ef1: 7 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
359 user: 7 |
2440
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
360 marker size: |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
361 format v1: |
2573
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
362 smallest length: 75 |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
363 longer length: 75 |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
364 median length: 75 |
8c25b4e92212
effectflag: activate effect flag on test-prune.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2547
diff
changeset
|
365 mean length: 75 |
2440
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
366 format v0: |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
367 smallest length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
368 longer length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
369 median length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
370 mean length: * (glob) |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
371 disconnected clusters: 7 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
372 any known node: 7 |
810
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
373 smallest length: 1 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
374 longer length: 1 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
375 median length: 1 |
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
376 mean length: 1 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
377 using parents data: 7 |
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
378 any known node: 7 |
810
de20d5500571
debugobsstorestat: add test for pruning
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
805
diff
changeset
|
379 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
|
380 longer length: 1 |
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
381 median length: 1 |
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
382 mean length: 1 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
383 |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
384 $ mkcommit rg |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
385 created new head |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
386 $ hg bookmark rg |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
387 $ hg up 10 |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
388 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
|
389 (leaving bookmark rg) |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
390 $ hg bookmark r10 |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
391 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
392 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
|
393 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
394 | 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
|
395 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
396 | | 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
|
397 | | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
398 | | | 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
|
399 | | |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
400 | | 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
|
401 | |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
402 +---@ 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
|
403 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
404 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
|
405 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
406 o | 7:e7d9710d9fc6[] (draft) r7 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
407 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
408 o 3:2b6d669947cd[] (draft) r3 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
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 2:fa942426a6fd[] (draft) r2 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
411 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
412 o | 1:66f7d451a68b[] (draft) r1 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
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 0:1ea73414a91b[] (draft) r0 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
415 |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
416 $ hg prune 11 |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
417 1 changesets pruned |
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
418 $ hg log -G |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
419 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
|
420 | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
421 | 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
|
422 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
423 | | 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
|
424 | | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
425 | | | 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
|
426 | | |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
427 | | 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
|
428 | |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
429 +---@ 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
|
430 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
431 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
|
432 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
433 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
|
434 |/ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
435 o 3:2b6d669947cd[] (draft) r3 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
436 |\ |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
437 | o 2:fa942426a6fd[] (draft) r2 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
438 | | |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1689
diff
changeset
|
439 o | 1:66f7d451a68b[] (draft) r1 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
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 0:1ea73414a91b[] (draft) r0 |
1335
50a40a8cf7be
evolve: current bookmark wrongly moving during prune (issue4559)
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
442 |
1345
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
443 $ hg book CELESTE |
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
444 $ 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
|
445 1 changesets pruned |
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
446 $ hg book |
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
447 B 8:d62d843c9a01 |
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
448 * CELESTE 8:d62d843c9a01 |
37c505975e28
evolve: add a test for prune --keep -r . with active bookmark
Laurent Charignon <lcharignon@fb.com>
parents:
1344
diff
changeset
|
449 r10 8:d62d843c9a01 |
1564
42c30774e63d
prune: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents:
1471
diff
changeset
|
450 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
|
451 |