43 created new head |
43 created new head |
44 $ hg prune -s "desc(bdivergent1)" "desc(_b)" |
44 $ hg prune -s "desc(bdivergent1)" "desc(_b)" |
45 1 changesets pruned |
45 1 changesets pruned |
46 $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden |
46 $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden |
47 1 changesets pruned |
47 1 changesets pruned |
48 2 new 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 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] |
52 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] |
53 |/ |
53 |/ |
60 updating to "local" conflict |
60 updating to "local" conflict |
61 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
61 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
63 working directory is now at c26f1d3baed2 |
63 working directory is now at c26f1d3baed2 |
64 $ hg log -G |
64 $ hg log -G |
65 @ 5:c26f1d3baed2@default(draft) add bdivergent1 [] |
65 @ 4:c26f1d3baed2@default(draft) add bdivergent1 [] |
66 | |
66 | |
67 o 0:135f39f4bd78@default(draft) add _a [] |
67 o 0:135f39f4bd78@default(draft) add _a [] |
68 |
68 |
69 Test divergence resolution when it yields to an empty commit (issue4950) |
69 Test divergence resolution when it yields to an empty commit (issue4950) |
70 cdivergent2 contains the same content than cdivergent1 and they are divergent |
70 cdivergent2 contains the same content than cdivergent1 and they are divergent |
86 created new head |
86 created new head |
87 $ hg prune -s "desc(cdivergent1)" "desc(_c)" |
87 $ hg prune -s "desc(cdivergent1)" "desc(_c)" |
88 1 changesets pruned |
88 1 changesets pruned |
89 $ hg prune -s "desc(cdivergent2)" "desc(_c)" --hidden |
89 $ hg prune -s "desc(cdivergent2)" "desc(_c)" --hidden |
90 1 changesets pruned |
90 1 changesets pruned |
91 2 new divergent changesets |
91 2 new content-divergent changesets |
92 $ hg log -G |
92 $ hg log -G |
93 @ 8:0a768ef678d9@default(draft) cdivergent2 [content-divergent] |
93 @ 7:0a768ef678d9@default(draft) cdivergent2 [content-divergent] |
94 | |
94 | |
95 | o 7:26c7705fee96@default(draft) add cdivergent1 [content-divergent] |
95 | o 6:26c7705fee96@default(draft) add cdivergent1 [content-divergent] |
96 |/ |
96 |/ |
97 | o 5: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 |
101 $ hg evolve --all --any --contentdivergent |
101 $ hg evolve --all --any --contentdivergent |
102 merge:[7] add cdivergent1 |
102 merge:[6] add cdivergent1 |
103 with: [8] cdivergent2 |
103 with: [7] cdivergent2 |
104 base: [6] add _c |
104 base: [5] add _c |
105 updating to "local" conflict |
105 updating to "local" conflict |
106 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
106 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
107 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
107 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
108 working directory is now at 6602ff5a79dc |
108 nothing changed |
|
109 working directory is now at 26c7705fee96 |
109 |
110 |
110 Test None docstring issue of evolve divergent, which caused hg crush |
111 Test None docstring issue of evolve divergent, which caused hg crush |
111 |
112 |
112 $ hg init test2 |
113 $ hg init test2 |
113 $ cd test2 |
114 $ cd test2 |
122 created new head |
123 created new head |
123 $ hg prune -s "desc(bdivergent1)" "desc(_b)" |
124 $ hg prune -s "desc(bdivergent1)" "desc(_b)" |
124 1 changesets pruned |
125 1 changesets pruned |
125 $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden |
126 $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden |
126 1 changesets pruned |
127 1 changesets pruned |
127 2 new divergent changesets |
128 2 new content-divergent changesets |
128 $ hg log -G |
129 $ hg log -G |
129 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] |
130 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] |
130 | |
131 | |
131 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] |
132 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] |
132 |/ |
133 |/ |