equal
deleted
inserted
replaced
40 $ cd test1 |
40 $ cd test1 |
41 $ mkcommits _a _b _c |
41 $ mkcommits _a _b _c |
42 $ hg up "desc(_b)" |
42 $ hg up "desc(_b)" |
43 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
43 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
44 $ hg amend -m "bprime" |
44 $ hg amend -m "bprime" |
45 1 new orphan changesets |
45 1 new unstable changesets |
46 $ hg log -G |
46 $ hg log -G |
47 @ 3:36050226a9b9@default(draft) bprime |
47 @ 3:36050226a9b9@default(draft) bprime |
48 | |
48 | |
49 | o 2:102002290587@default(draft) add _c |
49 | o 2:102002290587@default(draft) add _c |
50 | | |
50 | | |
80 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
80 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
81 $ mkcommits bprimesplit1 bprimesplit2 |
81 $ mkcommits bprimesplit1 bprimesplit2 |
82 created new head |
82 created new head |
83 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split |
83 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split |
84 1 changesets pruned |
84 1 changesets pruned |
85 1 new orphan changesets |
85 1 new unstable changesets |
86 $ hg up "desc(_a)" |
86 $ hg up "desc(_a)" |
87 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
87 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
88 $ mkcommits bsecondsplit1 bsecondsplit2 |
88 $ mkcommits bsecondsplit1 bsecondsplit2 |
89 created new head |
89 created new head |
90 $ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)" |
90 $ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)" |
91 1 changesets pruned |
91 1 changesets pruned |
92 1 new orphan changesets |
92 1 new unstable changesets |
93 $ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)" |
93 $ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)" |
94 1 changesets pruned |
94 1 changesets pruned |
95 $ hg log -G |
95 $ hg log -G |
96 @ 6:59b942dbda14@default(draft) add bsecondsplit2 |
96 @ 6:59b942dbda14@default(draft) add bsecondsplit2 |
97 | |
97 | |