Mercurial > evolve

comparison tests/test-divergent.t @ 3105:f5d472b7e800 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 19:32:18 +0200
parents 945a0989e41b
children a867d59ea97a
comparison
equal deleted inserted replaced
3104:3dd5a6f83f8b 3105:f5d472b7e800
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 @ 4:c26f1d3baed2@default(draft) add bdivergent1 [] 65 @ 5: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
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 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 @ 8:0a768ef678d9@default(draft) cdivergent2 [content-divergent]
94 | 94 |
95 | o 6:26c7705fee96@default(draft) add cdivergent1 [content-divergent] 95 | o 7:26c7705fee96@default(draft) add cdivergent1 [content-divergent]
96 |/ 96 |/
97 | o 4:c26f1d3baed2@default(draft) add bdivergent1 [] 97 | o 5: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:[6] add cdivergent1 102 merge:[7] add cdivergent1
103 with: [7] cdivergent2 103 with: [8] cdivergent2
104 base: [5] add _c 104 base: [6] 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 nothing changed 108 working directory is now at 6602ff5a79dc
109 working directory is now at 26c7705fee96
110 109
111 Test None docstring issue of evolve divergent, which caused hg crush 110 Test None docstring issue of evolve divergent, which caused hg crush
112 111
113 $ hg init test2 112 $ hg init test2
114 $ cd test2 113 $ cd test2