equal
deleted
inserted
replaced
240 |
240 |
241 Fixing "bumped" situation |
241 Fixing "bumped" situation |
242 We need to create a clone of 5 and add a special marker with a flag |
242 We need to create a clone of 5 and add a special marker with a flag |
243 |
243 |
244 $ hg summary |
244 $ hg summary |
245 parent: 5:5601fb93a350 tip |
245 parent: 5:5601fb93a350 tip (bumped) |
246 add new_3_c |
246 add new_3_c |
247 branch: default |
247 branch: default |
248 commit: (clean) |
248 commit: (clean) |
249 update: 1 new changesets, 2 branch heads (merge) |
249 update: 1 new changesets, 2 branch heads (merge) |
250 phases: 1 draft |
250 phases: 1 draft |
475 $ hg debugobsolete | grep `getid original_d` |
475 $ hg debugobsolete | grep `getid original_d` |
476 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
476 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
477 $ hg log -r 'obsolete()' |
477 $ hg log -r 'obsolete()' |
478 4:94b33453f93b (draft) [ ] add original_d |
478 4:94b33453f93b (draft) [ ] add original_d |
479 $ hg summary |
479 $ hg summary |
480 parent: 5:cda648ca50f5 tip |
480 parent: 5:cda648ca50f5 tip (unstable) |
481 add original_e |
481 add original_e |
482 branch: default |
482 branch: default |
483 commit: (clean) |
483 commit: (clean) |
484 update: 1 new changesets, 2 branch heads (merge) |
484 update: 1 new changesets, 2 branch heads (merge) |
485 phases: 3 draft |
485 phases: 3 draft |
823 date: Thu Jan 01 00:00:00 1970 +0000 |
823 date: Thu Jan 01 00:00:00 1970 +0000 |
824 trouble: unstable, bumped |
824 trouble: unstable, bumped |
825 summary: add babar |
825 summary: add babar |
826 |
826 |
827 |
827 |
|
828 test summary output |
|
829 |
|
830 $ hg up -r 'bumped() and unstable()' |
|
831 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
832 $ hg summary |
|
833 parent: 7:50c51b361e60 (unstable, bumped) |
|
834 add babar |
|
835 branch: default |
|
836 commit: 3 unknown (clean) |
|
837 update: 2 new changesets (update) |
|
838 phases: 4 draft |
|
839 unstable: 2 changesets |
|
840 bumped: 1 changesets |
|
841 |
828 Test incoming/outcoming with changesets obsoleted remotely, known locally |
842 Test incoming/outcoming with changesets obsoleted remotely, known locally |
829 =============================================================================== |
843 =============================================================================== |
830 |
844 |
831 This test issue 3805 |
845 This test issue 3805 |
832 |
846 |