205 |
205 |
206 Check that public changeset are not accounted as obsolete: |
206 Check that public changeset are not accounted as obsolete: |
207 |
207 |
208 $ hg --hidden phase --public 2 |
208 $ hg --hidden phase --public 2 |
209 $ hg log -G |
209 $ hg log -G |
210 @ 5:5601fb93a350 (draft bumped) [tip ] add new_3_c |
210 @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c |
211 | |
211 | |
212 | o 2:245bde4270cd (public) [ ] add original_c |
212 | o 2:245bde4270cd (public) [ ] add original_c |
213 |/ |
213 |/ |
214 o 1:7c3bad9141dc (public) [ ] add b |
214 o 1:7c3bad9141dc (public) [ ] add b |
215 | |
215 | |
222 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also |
222 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also |
223 note that the bumped changeset (5:5601fb93a350) is not a direct successor of |
223 note that the bumped changeset (5:5601fb93a350) is not a direct successor of |
224 the public changeset |
224 the public changeset |
225 |
225 |
226 $ hg log --hidden -r 'bumped()' |
226 $ hg log --hidden -r 'bumped()' |
227 5:5601fb93a350 (draft bumped) [tip ] add new_3_c |
227 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c |
228 |
228 |
229 And that we can't push bumped changeset |
229 And that we can't push bumped changeset |
230 |
230 |
231 $ hg push ../tmpa -r 0 --force #(make repo related) |
231 $ hg push ../tmpa -r 0 --force #(make repo related) |
232 pushing to ../tmpa |
232 pushing to ../tmpa |
237 adding file changes |
237 adding file changes |
238 added 1 changesets with 1 changes to 1 files (+1 heads) |
238 added 1 changesets with 1 changes to 1 files (+1 heads) |
239 $ hg push ../tmpa |
239 $ hg push ../tmpa |
240 pushing to ../tmpa |
240 pushing to ../tmpa |
241 searching for changes |
241 searching for changes |
242 abort: push includes bumped changeset: 5601fb93a350! |
242 abort: push includes phase-divergent changeset: 5601fb93a350! |
243 [255] |
243 [255] |
244 |
244 |
245 Fixing "bumped" situation |
245 Fixing "bumped" situation |
246 We need to create a clone of 5 and add a special marker with a flag |
246 We need to create a clone of 5 and add a special marker with a flag |
247 |
247 |
248 $ hg summary |
248 $ hg summary |
249 parent: 5:5601fb93a350 tip (bumped) |
249 parent: 5:5601fb93a350 tip (phase-divergent) |
250 add new_3_c |
250 add new_3_c |
251 branch: default |
251 branch: default |
252 commit: (clean) |
252 commit: (clean) |
253 update: 1 new changesets, 2 branch heads (merge) |
253 update: 1 new changesets, 2 branch heads (merge) |
254 phases: 1 draft |
254 phases: 1 draft |
255 bumped: 1 changesets |
255 phase-divergent: 1 changesets |
256 $ hg up '5^' |
256 $ hg up '5^' |
257 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
257 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
258 $ hg revert -ar 5 |
258 $ hg revert -ar 5 |
259 adding new_3_c |
259 adding new_3_c |
260 $ hg ci -m 'add n3w_3_c' |
260 $ hg ci -m 'add n3w_3_c' |
912 $ hg debugobsolete `getid original_c` `getid babar` |
912 $ hg debugobsolete `getid original_c` `getid babar` |
913 $ hg log --config ui.logtemplate= -r 'bumped() and unstable()' |
913 $ hg log --config ui.logtemplate= -r 'bumped() and unstable()' |
914 changeset: 7:50c51b361e60 |
914 changeset: 7:50c51b361e60 |
915 user: test |
915 user: test |
916 date: Thu Jan 01 00:00:00 1970 +0000 |
916 date: Thu Jan 01 00:00:00 1970 +0000 |
917 instability: orphan, bumped |
917 instability: orphan, phase-divergent |
918 summary: add babar |
918 summary: add babar |
919 |
919 |
920 |
920 |
921 test the "obsolete" templatekw |
921 test the "obsolete" templatekw |
922 |
922 |
924 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e |
924 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e |
925 |
925 |
926 test the "troubles" templatekw |
926 test the "troubles" templatekw |
927 |
927 |
928 $ hg log -r 'bumped() and unstable()' |
928 $ hg log -r 'bumped() and unstable()' |
929 7:50c51b361e60 (draft orphan bumped) [ ] add babar |
929 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar |
930 |
930 |
931 test the default cmdline template |
931 test the default cmdline template |
932 |
932 |
933 $ hg log -T default -r 'bumped()' |
933 $ hg log -T default -r 'bumped()' |
934 changeset: 7:50c51b361e60 |
934 changeset: 7:50c51b361e60 |
935 user: test |
935 user: test |
936 date: Thu Jan 01 00:00:00 1970 +0000 |
936 date: Thu Jan 01 00:00:00 1970 +0000 |
937 trouble: orphan, bumped |
937 trouble: orphan, phase-divergent |
938 summary: add babar |
938 summary: add babar |
939 |
939 |
940 $ hg log -T default -r 'obsolete()' |
940 $ hg log -T default -r 'obsolete()' |
941 changeset: 6:3de5eca88c00 |
941 changeset: 6:3de5eca88c00 |
942 parent: 3:6f9641995072 |
942 parent: 3:6f9641995072 |
948 test summary output |
948 test summary output |
949 |
949 |
950 $ hg up -r 'bumped() and unstable()' |
950 $ hg up -r 'bumped() and unstable()' |
951 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
951 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
952 $ hg summary |
952 $ hg summary |
953 parent: 7:50c51b361e60 (orphan, bumped) |
953 parent: 7:50c51b361e60 (orphan, phase-divergent) |
954 add babar |
954 add babar |
955 branch: default |
955 branch: default |
956 commit: (clean) |
956 commit: (clean) |
957 update: 2 new changesets (update) |
957 update: 2 new changesets (update) |
958 phases: 4 draft |
958 phases: 4 draft |
959 orphan: 2 changesets |
959 orphan: 2 changesets |
960 bumped: 1 changesets |
960 phase-divergent: 1 changesets |
961 $ hg up -r 'obsolete()' |
961 $ hg up -r 'obsolete()' |
962 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
962 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
963 $ hg summary |
963 $ hg summary |
964 parent: 6:3de5eca88c00 (obsolete) |
964 parent: 6:3de5eca88c00 (obsolete) |
965 add obsolete_e |
965 add obsolete_e |
966 branch: default |
966 branch: default |
967 commit: (clean) |
967 commit: (clean) |
968 update: 3 new changesets (update) |
968 update: 3 new changesets (update) |
969 phases: 4 draft |
969 phases: 4 draft |
970 orphan: 2 changesets |
970 orphan: 2 changesets |
971 bumped: 1 changesets |
971 phase-divergent: 1 changesets |
972 |
972 |
973 Test incoming/outcoming with changesets obsoleted remotely, known locally |
973 Test incoming/outcoming with changesets obsoleted remotely, known locally |
974 =============================================================================== |
974 =============================================================================== |
975 |
975 |
976 This test issue 3805 |
976 This test issue 3805 |