65 $ hg log -G |
65 $ hg log -G |
66 @ 5:c26f1d3baed2@default(draft) add bdivergent1 [] |
66 @ 5:c26f1d3baed2@default(draft) add bdivergent1 [] |
67 | |
67 | |
68 o 0:135f39f4bd78@default(draft) add _a [] |
68 o 0:135f39f4bd78@default(draft) add _a [] |
69 |
69 |
|
70 Test divergence resolution when it yields to an empty commit (issue4950) |
|
71 cdivergent2 contains the same content than cdivergent1 and they are divergent |
|
72 versions of the revision _c |
|
73 |
|
74 $ hg up "desc(_a)" |
|
75 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
76 $ mkcommit _c |
|
77 created new head |
|
78 $ hg up "desc(_a)" |
|
79 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
80 $ mkcommit cdivergent1 |
|
81 created new head |
|
82 $ hg up "desc(_a)" |
|
83 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
84 $ echo "cdivergent1" > cdivergent1 |
|
85 $ hg add cdivergent1 |
|
86 $ hg ci -m "cdivergent2" |
|
87 created new head |
|
88 $ hg prune -s "desc(cdivergent1)" "desc(_c)" |
|
89 1 changesets pruned |
|
90 $ hg prune -s "desc(cdivergent2)" "desc(_c)" --hidden |
|
91 1 changesets pruned |
|
92 2 new divergent changesets |
|
93 $ hg log -G |
|
94 @ 8:0a768ef678d9@default(draft) cdivergent2 [divergent] |
|
95 | |
|
96 | o 7:26c7705fee96@default(draft) add cdivergent1 [divergent] |
|
97 |/ |
|
98 | o 5:c26f1d3baed2@default(draft) add bdivergent1 [] |
|
99 |/ |
|
100 o 0:135f39f4bd78@default(draft) add _a [] |
|
101 |
|
102 $ hg evolve --all --any --divergent |
|
103 merge:[7] add cdivergent1 |
|
104 with: [8] cdivergent2 |
|
105 base: [6] add _c |
|
106 updating to "local" conflict |
|
107 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
108 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
109 working directory is now at 6602ff5a79dc |
|
110 |
70 $ cd .. |
111 $ cd .. |