Mercurial > evolve

comparison tests/test-divergent.t @ 3000:bd7e8be29542 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge future 6.7.0 in the stable branch We are getting ready to release a new version.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 00:54:28 +0200
parents 06844693bb21
children 945a0989e41b
comparison
equal deleted inserted replaced
2852:0d16c89aa185 3000:bd7e8be29542
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 divergent changesets
49 $ hg log -G 49 $ hg log -G
50 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [divergent] 50 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
51 | 51 |
52 | o 2:c2f698071cba@default(draft) add bdivergent1 [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 --divergent 56 $ hg evolve --all --any --contentdivergent
57 merge:[2] add bdivergent1 57 merge:[2] add bdivergent1
58 with: [3] add bdivergent2 58 with: [3] add bdivergent2
59 base: [1] add _b 59 base: [1] add _b
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
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 divergent changesets
92 $ hg log -G 92 $ hg log -G
93 @ 8:0a768ef678d9@default(draft) cdivergent2 [divergent] 93 @ 8:0a768ef678d9@default(draft) cdivergent2 [content-divergent]
94 | 94 |
95 | o 7:26c7705fee96@default(draft) add cdivergent1 [divergent] 95 | o 7:26c7705fee96@default(draft) add cdivergent1 [content-divergent]
96 |/ 96 |/
97 | o 5: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 --divergent 101 $ hg evolve --all --any --contentdivergent
102 merge:[7] add cdivergent1 102 merge:[7] add cdivergent1
103 with: [8] cdivergent2 103 with: [8] cdivergent2
104 base: [6] 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
124 1 changesets pruned 124 1 changesets pruned
125 $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden 125 $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden
126 1 changesets pruned 126 1 changesets pruned
127 2 new divergent changesets 127 2 new divergent changesets
128 $ hg log -G 128 $ hg log -G
129 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [divergent] 129 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
130 | 130 |
131 | o 2:c2f698071cba@default(draft) add bdivergent1 [divergent] 131 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
132 |/ 132 |/
133 o 0:135f39f4bd78@default(draft) add _a [] 133 o 0:135f39f4bd78@default(draft) add _a []
134 134
135 $ cat >$TESTTMP/test_extension.py << EOF 135 $ cat >$TESTTMP/test_extension.py << EOF
136 > from mercurial import merge 136 > from mercurial import merge
143 > [extensions] 143 > [extensions]
144 > testextension=$TESTTMP/test_extension.py 144 > testextension=$TESTTMP/test_extension.py
145 > EOF 145 > EOF
146 $ hg evolve --all 146 $ hg evolve --all
147 nothing to evolve on current working copy parent 147 nothing to evolve on current working copy parent
148 (do you want to use --divergent) 148 (do you want to use --contentdivergent)
149 [2] 149 [2]
150 $ hg evolve --divergent 150 $ hg evolve --contentdivergent
151 merge:[3] add bdivergent2 151 merge:[3] add bdivergent2
152 with: [2] add bdivergent1 152 with: [2] add bdivergent1
153 base: [1] add _b 153 base: [1] add _b
154 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 154 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
155 working directory is now at aa26817f6fbe 155 working directory is now at aa26817f6fbe