equal
deleted
inserted
replaced
2 > [extensions] |
2 > [extensions] |
3 > EOF |
3 > EOF |
4 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
4 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
5 |
5 |
6 $ glog() { |
6 $ glog() { |
7 > hg log -G --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' "$@" |
7 > hg log -G --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' "$@" |
8 > } |
8 > } |
9 |
9 |
10 $ hg init repo |
10 $ hg init repo |
11 $ cd repo |
11 $ cd repo |
12 |
12 |
117 o |
117 o |
118 |
118 |
119 Add a couple of bookmarks |
119 Add a couple of bookmarks |
120 |
120 |
121 $ glog --hidden |
121 $ glog --hidden |
122 @ 3:5eb72dbe0cb4@bar(draft) touncommit |
122 @ 3:5eb72dbe0cb4@bar(/draft) touncommit |
123 | |
123 | |
124 o 2:f63b90038565@default(draft) merge |
124 o 2:f63b90038565@default(/draft) merge |
125 |\ |
125 |\ |
126 | o 1:f15c744d48e8@default(draft) addmore |
126 | o 1:f15c744d48e8@default(/draft) addmore |
127 | |
127 | |
128 o 0:07f494440405@default(draft) adda |
128 o 0:07f494440405@default(/draft) adda |
129 |
129 |
130 $ hg bookmark -r 2 unrelated |
130 $ hg bookmark -r 2 unrelated |
131 $ hg bookmark touncommit-bm |
131 $ hg bookmark touncommit-bm |
132 $ hg bookmark --inactive touncommit-bm-inactive |
132 $ hg bookmark --inactive touncommit-bm-inactive |
133 $ hg bookmarks |
133 $ hg bookmarks |
216 d |
216 d |
217 d |
217 d |
218 $ hg cat -r . e |
218 $ hg cat -r . e |
219 e |
219 e |
220 $ glog --hidden |
220 $ glog --hidden |
221 @ 4:e8db4aa611f6@bar(draft) touncommit |
221 @ 4:e8db4aa611f6@bar(/draft) touncommit |
222 | |
222 | |
223 | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |
223 | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |
224 |/ |
224 |/ |
225 o 2:f63b90038565@default(draft) merge |
225 o 2:f63b90038565@default(/draft) merge |
226 |\ |
226 |\ |
227 | o 1:f15c744d48e8@default(draft) addmore |
227 | o 1:f15c744d48e8@default(/draft) addmore |
228 | |
228 | |
229 o 0:07f494440405@default(draft) adda |
229 o 0:07f494440405@default(/draft) adda |
230 |
230 |
231 $ hg bookmarks |
231 $ hg bookmarks |
232 * touncommit-bm 4:e8db4aa611f6 |
232 * touncommit-bm 4:e8db4aa611f6 |
233 touncommit-bm-inactive 4:e8db4aa611f6 |
233 touncommit-bm-inactive 4:e8db4aa611f6 |
234 unrelated 2:f63b90038565 |
234 unrelated 2:f63b90038565 |
264 R f |
264 R f |
265 R g |
265 R g |
266 R m |
266 R m |
267 R n |
267 R n |
268 $ glog --hidden |
268 $ glog --hidden |
269 @ 5:a1d4c1ad76cc@bar(draft) touncommit |
269 @ 5:a1d4c1ad76cc@bar(/draft) touncommit |
270 | |
270 | |
271 | o 4:e8db4aa611f6@bar(draft) touncommit |
271 | o 4:e8db4aa611f6@bar(/draft) touncommit |
272 |/ |
272 |/ |
273 | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |
273 | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |
274 |/ |
274 |/ |
275 o 2:f63b90038565@default(draft) merge |
275 o 2:f63b90038565@default(/draft) merge |
276 |\ |
276 |\ |
277 | o 1:f15c744d48e8@default(draft) addmore |
277 | o 1:f15c744d48e8@default(/draft) addmore |
278 | |
278 | |
279 o 0:07f494440405@default(draft) adda |
279 o 0:07f494440405@default(/draft) adda |
280 |
280 |
281 $ hg debugobsolete |
281 $ hg debugobsolete |
282 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
282 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
283 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
283 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
284 |
284 |