equal
deleted
inserted
replaced
188 created new head |
188 created new head |
189 $ echo 43 >> b |
189 $ echo 43 >> b |
190 $ hg commit -A -m "A0" |
190 $ hg commit -A -m "A0" |
191 adding b |
191 adding b |
192 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
192 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
|
193 obsoleted 1 changesets |
193 |
194 |
194 $ hg log --hidden -G |
195 $ hg log --hidden -G |
195 @ changeset: 3:f257fde29c7a |
196 @ changeset: 3:f257fde29c7a |
196 | tag: tip |
197 | tag: tip |
197 | user: test |
198 | user: test |
305 $ hg commit -A -m "C0" |
306 $ hg commit -A -m "C0" |
306 adding A0 |
307 adding A0 |
307 adding B0 |
308 adding B0 |
308 created new head |
309 created new head |
309 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
310 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
|
311 obsoleted 1 changesets |
310 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
312 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
313 obsoleted 1 changesets |
311 |
314 |
312 $ hg log --hidden -G |
315 $ hg log --hidden -G |
313 @ changeset: 3:eb5a0daa2192 |
316 @ changeset: 3:eb5a0daa2192 |
314 | tag: tip |
317 | tag: tip |
315 | parent: 0:ea207398892e |
318 | parent: 0:ea207398892e |
602 $ hg commit -A -m "C0" |
605 $ hg commit -A -m "C0" |
603 adding A0 |
606 adding A0 |
604 adding B0 |
607 adding B0 |
605 created new head |
608 created new head |
606 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
609 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
|
610 obsoleted 1 changesets |
607 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` |
611 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` |
|
612 obsoleted 1 changesets |
608 |
613 |
609 $ hg log --hidden -G |
614 $ hg log --hidden -G |
610 @ changeset: 4:eb5a0daa2192 |
615 @ changeset: 4:eb5a0daa2192 |
611 | tag: tip |
616 | tag: tip |
612 | parent: 0:ea207398892e |
617 | parent: 0:ea207398892e |
874 created new head |
879 created new head |
875 |
880 |
876 Create the cycle |
881 Create the cycle |
877 |
882 |
878 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
883 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
|
884 obsoleted 1 changesets |
879 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
885 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
886 obsoleted 1 changesets |
880 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
887 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
881 |
888 |
882 Check templates |
889 Check templates |
883 --------------- |
890 --------------- |
884 |
891 |
1031 user: test |
1038 user: test |
1032 date: Thu Jan 01 00:00:00 1970 +0000 |
1039 date: Thu Jan 01 00:00:00 1970 +0000 |
1033 summary: ROOT |
1040 summary: ROOT |
1034 |
1041 |
1035 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` |
1042 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` |
|
1043 obsoleted 1 changesets |
1036 $ hg log -G |
1044 $ hg log -G |
1037 @ changeset: 7:ba2ed02b0c9a |
1045 @ changeset: 7:ba2ed02b0c9a |
1038 | tag: tip |
1046 | tag: tip |
1039 | user: test |
1047 | user: test |
1040 | date: Thu Jan 01 00:00:00 1970 +0000 |
1048 | date: Thu Jan 01 00:00:00 1970 +0000 |
1246 $ hg init $TESTTMP/templates-local-prune |
1254 $ hg init $TESTTMP/templates-local-prune |
1247 $ cd $TESTTMP/templates-local-prune |
1255 $ cd $TESTTMP/templates-local-prune |
1248 $ mkcommit ROOT |
1256 $ mkcommit ROOT |
1249 $ mkcommit A0 |
1257 $ mkcommit A0 |
1250 $ hg debugobsolete --record-parent `getid "."` |
1258 $ hg debugobsolete --record-parent `getid "."` |
|
1259 obsoleted 1 changesets |
1251 |
1260 |
1252 Check output |
1261 Check output |
1253 ------------ |
1262 ------------ |
1254 |
1263 |
1255 $ hg up "desc(A0)" --hidden |
1264 $ hg up "desc(A0)" --hidden |