equal
deleted
inserted
replaced
2 > [web] |
2 > [web] |
3 > push_ssl = false |
3 > push_ssl = false |
4 > allow_push = * |
4 > allow_push = * |
5 > [phases] |
5 > [phases] |
6 > publish=False |
6 > publish=False |
7 > [alias] |
|
8 > odiff=diff --rev 'limit(precursors(.),1)' --rev . |
|
9 > [extensions] |
7 > [extensions] |
10 > hgext.rebase= |
8 > hgext.rebase= |
11 > EOF |
9 > EOF |
12 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
10 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
13 $ mkcommit() { |
11 $ mkcommit() { |
14 > echo "$1" > "$1" |
12 > echo "$1" > "$1" |
15 > hg add "$1" |
13 > hg add "$1" |
16 > hg ci -m "add $1" |
14 > hg ci -m "add $1" |
17 > } |
15 > } |
18 $ getid() { |
16 $ getid() { |
19 > hg id --debug -ir "$1" |
17 > hg id --hidden --debug -ir "$1" |
20 > } |
18 > } |
21 |
19 |
22 $ alias qlog="hg log --template='{rev}\n- {node|short}\n'" |
20 $ alias qlog="hg log --template='{rev}\n- {node|short}\n'" |
23 $ hg init local |
21 $ hg init local |
24 $ cd local |
22 $ cd local |
118 $ qlog -r 'allsuccessors(2)' --hidden |
116 $ qlog -r 'allsuccessors(2)' --hidden |
119 3 |
117 3 |
120 - 0d3f46688ccc |
118 - 0d3f46688ccc |
121 4 |
119 4 |
122 - 725c380fe99b |
120 - 725c380fe99b |
123 $ hg up 3 -q |
121 $ hg up --hidden 3 -q |
124 Working directory parent is obsolete |
122 Working directory parent is obsolete |
125 $ mkcommit d # 5 (on 3) |
123 $ mkcommit d # 5 (on 3) |
126 1 new unstable changesets |
124 1 new unstable changesets |
127 $ qlog -r 'obsolete()' |
125 $ qlog -r 'obsolete()' |
128 3 |
126 3 |
192 - 0d3f46688ccc |
190 - 0d3f46688ccc |
193 1 |
191 1 |
194 - 7c3bad9141dc |
192 - 7c3bad9141dc |
195 0 |
193 0 |
196 - 1f0dee641bb7 |
194 - 1f0dee641bb7 |
197 $ hg up 3 -q |
195 $ hg up --hidden 3 -q |
198 Working directory parent is obsolete |
196 Working directory parent is obsolete |
199 $ mkcommit obsol_d # 6 |
197 $ mkcommit obsol_d # 6 |
200 created new head |
198 created new head |
201 1 new unstable changesets |
199 1 new unstable changesets |
202 $ hg debugobsolete `getid 5` `getid 6` |
200 $ hg debugobsolete `getid 5` `getid 6` |
248 pushing to ../other-new |
246 pushing to ../other-new |
249 searching for changes |
247 searching for changes |
250 no changes found |
248 no changes found |
251 [1] |
249 [1] |
252 |
250 |
253 $ hg up -q .^ # 3 |
251 $ hg up --hidden -q .^ # 3 |
254 Working directory parent is obsolete |
252 Working directory parent is obsolete |
255 $ mkcommit "obsol_d'" # 7 |
253 $ mkcommit "obsol_d'" # 7 |
256 created new head |
254 created new head |
257 1 new unstable changesets |
255 1 new unstable changesets |
258 $ hg debugobsolete `getid 6` `getid 7` |
256 $ hg debugobsolete `getid 6` `getid 7` |
335 0 |
333 0 |
336 - 1f0dee641bb7 |
334 - 1f0dee641bb7 |
337 |
335 |
338 Test rollback support |
336 Test rollback support |
339 |
337 |
340 $ hg up .^ -q # 3 |
338 $ hg up --hidden .^ -q # 3 |
341 Working directory parent is obsolete |
339 Working directory parent is obsolete |
342 $ mkcommit "obsol_d''" |
340 $ mkcommit "obsol_d''" |
343 created new head |
341 created new head |
344 1 new unstable changesets |
342 1 new unstable changesets |
345 $ hg debugobsolete `getid 7` `getid 8` |
343 $ hg debugobsolete `getid 7` `getid 8` |
372 $ hg summary |
370 $ hg summary |
373 parent: 3:725c380fe99b |
371 parent: 3:725c380fe99b |
374 add obsol_c' |
372 add obsol_c' |
375 branch: default |
373 branch: default |
376 commit: 1 deleted, 2 unknown (clean) |
374 commit: 1 deleted, 2 unknown (clean) |
377 update: 4 new changesets, 4 branch heads (merge) |
375 update: 2 new changesets, 2 branch heads (merge) |
378 unstable: 1 changesets |
376 unstable: 1 changesets |
379 divergent: 1 changesets |
377 divergent: 1 changesets |
380 $ qlog |
378 $ qlog |
381 6 |
379 6 |
382 - 909a0fb57e5d |
380 - 909a0fb57e5d |
492 |
490 |
493 |
491 |
494 should not rebase extinct changeset |
492 should not rebase extinct changeset |
495 |
493 |
496 #excluded 'whole rebase set is extinct and ignored.' message not in core |
494 #excluded 'whole rebase set is extinct and ignored.' message not in core |
497 $ hg rebase -s 7 -d 4 2>&1 | grep -v 'whole rebase' |
|
498 nothing to rebase |
|
499 $ hg rebase -b '3' -d 4 --traceback |
495 $ hg rebase -b '3' -d 4 --traceback |
500 2 new divergent changesets |
496 2 new divergent changesets |
501 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
497 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
502 @ 11 - 9468a5f5d8b2 add obsol_d'' |
498 @ 11 - 9468a5f5d8b2 add obsol_d'' |
503 | |
499 | |
534 |
530 |
535 check bumped detection |
531 check bumped detection |
536 (make an obsolete changeset public) |
532 (make an obsolete changeset public) |
537 |
533 |
538 $ cd local |
534 $ cd local |
539 $ hg phase --public 11 |
535 $ hg phase --hidden --public 11 |
540 1 new bumped changesets |
536 1 new bumped changesets |
541 $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n' |
537 $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n' |
542 @ 12 - (draft) 6db5e282cb91 add obsol_d''' |
538 @ 12 - (draft) 6db5e282cb91 add obsol_d''' |
543 | |
539 | |
544 | o 11 - (public) 9468a5f5d8b2 add obsol_d'' |
540 | o 11 - (public) 9468a5f5d8b2 add obsol_d'' |
638 $ hg summary |
634 $ hg summary |
639 parent: 1[46]:50f11e5e3a63 tip (re) |
635 parent: 1[46]:50f11e5e3a63 tip (re) |
640 add obsolet_conflicting_d |
636 add obsolet_conflicting_d |
641 branch: default |
637 branch: default |
642 commit: (clean) |
638 commit: (clean) |
643 update: (9|11) new changesets, (9|10) branch heads \(merge\) (re) |
639 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
644 bumped: 1 changesets |
640 bumped: 1 changesets |
645 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
641 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
646 $ hg log -r 'conflicting()' |
642 $ hg log -r 'conflicting()' |
647 changeset: 12:6db5e282cb91 |
643 changeset: 12:6db5e282cb91 |
648 parent: 10:2033b4e49474 |
644 parent: 10:2033b4e49474 |