equal
deleted
inserted
replaced
13 > } |
13 > } |
14 |
14 |
15 $ hg init repo |
15 $ hg init repo |
16 $ cd repo |
16 $ cd repo |
17 $ mkcommit a |
17 $ mkcommit a |
|
18 $ hg phase --public . |
18 $ mkcommit b |
19 $ mkcommit b |
19 $ mkcommit c |
20 $ mkcommit c |
20 $ mkcommit d |
21 $ mkcommit d |
21 $ mkcommit e |
22 $ mkcommit e |
22 $ hg log -G |
23 $ hg log -G |
26 | |
27 | |
27 o 2:4538525df7e2@default(stable/draft) add c |
28 o 2:4538525df7e2@default(stable/draft) add c |
28 | |
29 | |
29 o 1:7c3bad9141dc@default(stable/draft) add b |
30 o 1:7c3bad9141dc@default(stable/draft) add b |
30 | |
31 | |
31 o 0:1f0dee641bb7@default(stable/draft) add a |
32 o 0:1f0dee641bb7@default(stable/public) add a |
32 |
33 |
33 |
34 |
34 Check simple case |
35 Check simple case |
35 ---------------------------- |
36 ---------------------------- |
36 |
37 |
91 | | |
92 | | |
92 | o 6:354011cd103f@default(stable/draft) add cc |
93 | o 6:354011cd103f@default(stable/draft) add cc |
93 | | |
94 | | |
94 | o 5:814c38b95e72@default(stable/draft) add bb |
95 | o 5:814c38b95e72@default(stable/draft) add bb |
95 |/ |
96 |/ |
96 o 0:1f0dee641bb7@default(stable/draft) add a |
97 o 0:1f0dee641bb7@default(stable/public) add a |
97 |
98 |
98 |
99 |
99 one old, one new |
100 one old, one new |
100 |
101 |
101 $ hg prune 'desc("add ee")' -s 'desc("add nE")' |
102 $ hg prune 'desc("add ee")' -s 'desc("add nE")' |
118 | | |
119 | | |
119 | o 6:354011cd103f@default(stable/draft) add cc |
120 | o 6:354011cd103f@default(stable/draft) add cc |
120 | | |
121 | | |
121 | o 5:814c38b95e72@default(stable/draft) add bb |
122 | o 5:814c38b95e72@default(stable/draft) add bb |
122 |/ |
123 |/ |
123 o 0:1f0dee641bb7@default(stable/draft) add a |
124 o 0:1f0dee641bb7@default(stable/public) add a |
124 |
125 |
125 |
126 |
126 one old, two new |
127 one old, two new |
127 |
128 |
128 $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' |
129 $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' |
144 | |
145 | |
145 | o 6:354011cd103f@default(stable/draft) add cc |
146 | o 6:354011cd103f@default(stable/draft) add cc |
146 | | |
147 | | |
147 | o 5:814c38b95e72@default(stable/draft) add bb |
148 | o 5:814c38b95e72@default(stable/draft) add bb |
148 |/ |
149 |/ |
149 o 0:1f0dee641bb7@default(stable/draft) add a |
150 o 0:1f0dee641bb7@default(stable/public) add a |
150 |
151 |
151 |
152 |
152 two old, two new (should be denied) |
153 two old, two new (should be denied) |
153 |
154 |
154 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")' |
155 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")' |