Mercurial > evolve

comparison tests/test-evolve-content-divergent-stack.t @ 4516:f54bb6eaf5e6 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 11 Apr 2019 22:44:53 +0200
parents 7a779a288793
children aafd51f145ea
comparison
equal deleted inserted replaced
4514:ef1c322c389d 4516:f54bb6eaf5e6
62 62
63 $ hg up c7586e2a9264 63 $ hg up c7586e2a9264
64 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 64 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
65 $ echo bar > a 65 $ echo bar > a
66 $ hg amend -m "watbar to a" 66 $ hg amend -m "watbar to a"
67 3 new orphan changesets
68 $ echo wat > a 67 $ echo wat > a
69 $ hg amend -m "watbar to a" 68 $ hg amend -m "watbar to a"
70 $ hg evolve --all 69 $ hg evolve --all
71 move:[2] added b 70 move:[2] added b
72 atop:[6] watbar to a 71 atop:[6] watbar to a
88 $ cd ../stacktest 87 $ cd ../stacktest
89 $ hg up .^^^ 88 $ hg up .^^^
90 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 89 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
91 $ echo wat > a 90 $ echo wat > a
92 $ hg amend -m "watbar to a" 91 $ hg amend -m "watbar to a"
93 3 new orphan changesets
94 $ hg evolve --all 92 $ hg evolve --all
95 move:[2] added b 93 move:[2] added b
96 atop:[5] watbar to a 94 atop:[5] watbar to a
97 move:[3] added c 95 move:[3] added c
98 move:[4] added d 96 move:[4] added d
115 adding changesets 113 adding changesets
116 adding manifests 114 adding manifests
117 adding file changes 115 adding file changes
118 added 4 changesets with 0 changes to 4 files (+1 heads) 116 added 4 changesets with 0 changes to 4 files (+1 heads)
119 5 new obsolescence markers 117 5 new obsolescence markers
120 8 new content-divergent changesets
121 new changesets 82b74d5dc678:15c781f93cac 118 new changesets 82b74d5dc678:15c781f93cac
122 (run 'hg heads' to see heads, 'hg merge' to merge) 119 (run 'hg heads' to see heads, 'hg merge' to merge)
123 120
124 $ hg glog 121 $ hg glog
125 * 12:15c781f93cac added d 122 o 12:15c781f93cac added d
126 | () [default] draft 123 | () [default] draft
127 * 11:9e5fb1d5b955 added c 124 o 11:9e5fb1d5b955 added c
128 | () [default] draft 125 | () [default] draft
129 * 10:88516dccf68a added b 126 o 10:88516dccf68a added b
130 | () [default] draft 127 | () [default] draft
131 * 9:82b74d5dc678 watbar to a 128 o 9:82b74d5dc678 watbar to a
132 | () [default] draft 129 | () [default] draft
133 | @ 8:c72d2885eb51 added d 130 | @ 8:c72d2885eb51 added d
134 | | () [default] draft 131 | | () [default] draft
135 | * 7:3ce4be6d8e5e added c 132 | o 7:3ce4be6d8e5e added c
136 | | () [default] draft 133 | | () [default] draft
137 | * 6:d5f148423c16 added b 134 | o 6:d5f148423c16 added b
138 | | () [default] draft 135 | | () [default] draft
139 | * 5:8e222f257bbf watbar to a 136 | o 5:8e222f257bbf watbar to a
140 |/ () [default] draft 137 |/ () [default] draft
141 o 0:8fa14d15e168 added hgignore 138 o 0:8fa14d15e168 added hgignore
142 () [default] draft 139 () [default] draft
143 140
144 $ hg evolve --all --content-divergent 141 $ hg evolve --all --content-divergent
146 with: [9] watbar to a 143 with: [9] watbar to a
147 base: [1] added a 144 base: [1] added a
148 updating to "local" side of the conflict: 8e222f257bbf 145 updating to "local" side of the conflict: 8e222f257bbf
149 merging "other" content-divergent changeset '82b74d5dc678' 146 merging "other" content-divergent changeset '82b74d5dc678'
150 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
151 6 new orphan changesets
152 merge:[6] added b 148 merge:[6] added b
153 with: [10] added b 149 with: [10] added b
154 base: [2] added b 150 base: [2] added b
155 updating to "local" side of the conflict: d5f148423c16 151 updating to "local" side of the conflict: d5f148423c16
156 merging "other" content-divergent changeset '88516dccf68a' 152 merging "other" content-divergent changeset '88516dccf68a'