equal
deleted
inserted
replaced
47 1 changesets pruned |
47 1 changesets pruned |
48 2 new content-divergent changesets |
48 2 new content-divergent changesets |
49 $ hg log -G |
49 $ hg log -G |
50 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] |
50 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] |
51 | |
51 | |
52 | * 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] |
52 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] |
53 |/ |
53 |/ |
54 o 0:135f39f4bd78@default(draft) add _a [] |
54 o 0:135f39f4bd78@default(draft) add _a [] |
55 |
55 |
56 $ hg evolve --all --any --content-divergent |
56 $ hg evolve --all --any --content-divergent |
57 merge:[2] add bdivergent1 |
57 merge:[2] add bdivergent1 |
90 1 changesets pruned |
90 1 changesets pruned |
91 2 new content-divergent changesets |
91 2 new content-divergent changesets |
92 $ hg log -G |
92 $ hg log -G |
93 @ 7:0a768ef678d9@default(draft) cdivergent2 [content-divergent] |
93 @ 7:0a768ef678d9@default(draft) cdivergent2 [content-divergent] |
94 | |
94 | |
95 | * 6:26c7705fee96@default(draft) add cdivergent1 [content-divergent] |
95 | o 6:26c7705fee96@default(draft) add cdivergent1 [content-divergent] |
96 |/ |
96 |/ |
97 | o 4:c26f1d3baed2@default(draft) add bdivergent1 [] |
97 | o 4:c26f1d3baed2@default(draft) add bdivergent1 [] |
98 |/ |
98 |/ |
99 o 0:135f39f4bd78@default(draft) add _a [] |
99 o 0:135f39f4bd78@default(draft) add _a [] |
100 |
100 |
127 1 changesets pruned |
127 1 changesets pruned |
128 2 new content-divergent changesets |
128 2 new content-divergent changesets |
129 $ hg log -G |
129 $ hg log -G |
130 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] |
130 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] |
131 | |
131 | |
132 | * 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] |
132 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] |
133 |/ |
133 |/ |
134 o 0:135f39f4bd78@default(draft) add _a [] |
134 o 0:135f39f4bd78@default(draft) add _a [] |
135 |
135 |
136 $ cat >$TESTTMP/test_extension.py << EOF |
136 $ cat >$TESTTMP/test_extension.py << EOF |
137 > from mercurial import merge |
137 > from mercurial import merge |