equal
deleted
inserted
replaced
46 (a)llow divergence or (d)uplicate the changeset? a |
46 (a)llow divergence or (d)uplicate the changeset? a |
47 2 new content-divergent changesets |
47 2 new content-divergent changesets |
48 $ hg log -G |
48 $ hg log -G |
49 @ 3:[0-9a-f]{12} a (re) |
49 @ 3:[0-9a-f]{12} a (re) |
50 |
50 |
51 o 2:[0-9a-f]{12} ab (re) |
51 \* 2:[0-9a-f]{12} ab (re) |
52 |
52 |
53 $ hg prune 3 |
53 $ hg prune 3 |
54 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
54 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
55 working directory now at 000000000000 |
55 working directory now at 000000000000 |
56 1 changesets pruned |
56 1 changesets pruned |
110 1 new orphan changesets |
110 1 new orphan changesets |
111 |
111 |
112 $ hg log -G --hidden |
112 $ hg log -G --hidden |
113 @ 11:[0-9a-f]{12} gna1 (re) |
113 @ 11:[0-9a-f]{12} gna1 (re) |
114 | |
114 | |
115 . o 10:[0-9a-f]{12} move (re) |
115 . \* 10:[0-9a-f]{12} move (re) |
116 | | |
116 | | |
117 . x 9:[0-9a-f]{12} gna1 (re) |
117 . x 9:[0-9a-f]{12} gna1 (re) |
118 |/ |
118 |/ |
119 o 8:[0-9a-f]{12} d (re) |
119 o 8:[0-9a-f]{12} d (re) |
120 | |
120 | |