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 |
89 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
88 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
90 $ mkcommits bprimesplit1 bprimesplit2 |
89 $ mkcommits bprimesplit1 bprimesplit2 |
91 created new head |
90 created new head |
92 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split |
91 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split |
93 1 changesets pruned |
92 1 changesets pruned |
94 1 new orphan changesets |
|
95 $ hg up "desc(_a)" |
93 $ hg up "desc(_a)" |
96 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
94 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
97 $ mkcommits bsecondsplit1 bsecondsplit2 |
95 $ mkcommits bsecondsplit1 bsecondsplit2 |
98 created new head |
96 created new head |
99 $ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)" |
97 $ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)" |
100 1 changesets pruned |
98 1 changesets pruned |
101 1 new orphan changesets |
|
102 $ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)" |
99 $ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)" |
103 1 changesets pruned |
100 1 changesets pruned |
104 $ hg log -G |
101 $ hg log -G |
105 @ 6:59b942dbda14@default(draft) add bsecondsplit2 |
102 @ 6:59b942dbda14@default(draft) add bsecondsplit2 |
106 | |
103 | |
107 o 5:8ffdae67d696@default(draft) add bsecondsplit1 |
104 o 5:8ffdae67d696@default(draft) add bsecondsplit1 |
108 | |
105 | |
109 | * 2:102002290587@default(draft) add _c |
106 | o 2:102002290587@default(draft) add _c |
110 | | |
107 | | |
111 | x 1:37445b16603b@default(draft) add _b |
108 | x 1:37445b16603b@default(draft) add _b |
112 |/ |
109 |/ |
113 o 0:135f39f4bd78@default(draft) add _a |
110 o 0:135f39f4bd78@default(draft) add _a |
114 |
111 |