Mercurial > hg
comparison tests/test-obsolete.t @ 33776:ed99d3afef88
revset: rename bumped into phasedivergent
Don't touch bumped volatile set name, only the revset name. The volatile set
name will be updated in a later patch.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D252
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 03 Aug 2017 14:08:39 +0200 |
parents | 9dcc3529e002 |
children | 2415ad743642 |
comparison
equal
deleted
inserted
replaced
33775:f078d7358e90 | 33776:ed99d3afef88 |
---|---|
221 | 221 |
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 'phasedivergent()' |
227 5:5601fb93a350 (draft phase-divergent) [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) |
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' |
261 created new head | 261 created new head |
262 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` | 262 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` |
263 obsoleted 1 changesets | 263 obsoleted 1 changesets |
264 $ hg log -r 'bumped()' | 264 $ hg log -r 'phasedivergent()' |
265 $ hg log -G | 265 $ hg log -G |
266 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | 266 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
267 | | 267 | |
268 | o 2:245bde4270cd (public) [ ] add original_c | 268 | o 2:245bde4270cd (public) [ ] add original_c |
269 |/ | 269 |/ |
908 Several troubles on the same changeset (create an unstable and bumped changeset) | 908 Several troubles on the same changeset (create an unstable and bumped changeset) |
909 | 909 |
910 $ hg debugobsolete `getid obsolete_e` | 910 $ hg debugobsolete `getid obsolete_e` |
911 obsoleted 1 changesets | 911 obsoleted 1 changesets |
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 orphan()' | 913 $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()' |
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, phase-divergent | 917 instability: orphan, phase-divergent |
918 summary: add babar | 918 summary: add babar |
923 $ hg log -r 'obsolete()' | 923 $ hg log -r 'obsolete()' |
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 orphan()' | 928 $ hg log -r 'phasedivergent() and orphan()' |
929 7:50c51b361e60 (draft orphan phase-divergent) [ ] 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 'phasedivergent()' |
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 instability: orphan, phase-divergent | 937 instability: orphan, phase-divergent |
938 summary: add babar | 938 summary: add babar |
945 summary: add obsolete_e | 945 summary: add obsolete_e |
946 | 946 |
947 | 947 |
948 test summary output | 948 test summary output |
949 | 949 |
950 $ hg up -r 'bumped() and orphan()' | 950 $ hg up -r 'phasedivergent() and orphan()' |
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, phase-divergent) | 953 parent: 7:50c51b361e60 (orphan, phase-divergent) |
954 add babar | 954 add babar |
955 branch: default | 955 branch: default |