49 $ cd test1 |
49 $ cd test1 |
50 $ mkcommits _a _b _c |
50 $ mkcommits _a _b _c |
51 $ hg up "desc(_b)" |
51 $ hg up "desc(_b)" |
52 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
52 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
53 $ hg amend -m "bprime" |
53 $ hg amend -m "bprime" |
54 1 new orphan changesets |
|
55 $ hg log -G |
54 $ hg log -G |
56 @ 3:36050226a9b9@default(draft) bprime |
55 @ 3:36050226a9b9@default(draft) bprime |
57 | |
56 | |
58 | * 2:102002290587@default(draft) add _c |
57 | o 2:102002290587@default(draft) add _c |
59 | | |
58 | | |
60 | x 1:37445b16603b@default(draft) add _b |
59 | x 1:37445b16603b@default(draft) add _b |
61 |/ |
60 |/ |
62 o 0:135f39f4bd78@default(draft) add _a |
61 o 0:135f39f4bd78@default(draft) add _a |
63 |
62 |
90 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
89 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
91 $ mkcommits bprimesplit1 bprimesplit2 |
90 $ mkcommits bprimesplit1 bprimesplit2 |
92 created new head |
91 created new head |
93 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split |
92 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split |
94 1 changesets pruned |
93 1 changesets pruned |
95 1 new orphan changesets |
|
96 $ hg up "desc(_a)" |
94 $ hg up "desc(_a)" |
97 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
95 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
98 $ mkcommits bsecondsplit1 bsecondsplit2 |
96 $ mkcommits bsecondsplit1 bsecondsplit2 |
99 created new head |
97 created new head |
100 $ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)" |
98 $ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)" |
101 1 changesets pruned |
99 1 changesets pruned |
102 1 new orphan changesets |
|
103 $ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)" |
100 $ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)" |
104 1 changesets pruned |
101 1 changesets pruned |
105 $ hg log -G |
102 $ hg log -G |
106 @ 6:59b942dbda14@default(draft) add bsecondsplit2 |
103 @ 6:59b942dbda14@default(draft) add bsecondsplit2 |
107 | |
104 | |
108 o 5:8ffdae67d696@default(draft) add bsecondsplit1 |
105 o 5:8ffdae67d696@default(draft) add bsecondsplit1 |
109 | |
106 | |
110 | * 2:102002290587@default(draft) add _c |
107 | o 2:102002290587@default(draft) add _c |
111 | | |
108 | | |
112 | x 1:37445b16603b@default(draft) add _b |
109 | x 1:37445b16603b@default(draft) add _b |
113 |/ |
110 |/ |
114 o 0:135f39f4bd78@default(draft) add _a |
111 o 0:135f39f4bd78@default(draft) add _a |
115 |
112 |