239 |
239 |
240 $ echo watbar > d |
240 $ echo watbar > d |
241 $ hg resolve -m |
241 $ hg resolve -m |
242 (no more unresolved files) |
242 (no more unresolved files) |
243 continue: hg evolve --continue |
243 continue: hg evolve --continue |
244 $ hg evolve --continue |
244 |
245 conflicts while merging descriptions, using description of divergent changeset |
245 $ cat > editor.sh <<EOF |
246 working directory is now at 578f12701e5a |
246 > #!/bin/sh |
247 |
247 > printf "**showing editors text**\n\n" |
248 $ hg glog |
248 > cat \$1 |
249 @ 16:578f12701e5a wat to d, wat? |
249 > printf "\n**done showing editors text**\n\n" |
250 | () [default] draft |
250 > cat > \$1 <<ENDOF |
251 o 3:ca1b80f7960a added c |
251 > watbar to d |
252 | () [default] draft |
252 > ENDOF |
253 o 2:b1661037fa25 added b |
253 > EOF |
254 | () [default] draft |
254 |
255 o 1:c7586e2a9264 added a |
255 $ HGEDITOR='sh ./editor.sh' hg evolve --continue |
256 | () [default] draft |
256 **showing editors text** |
257 o 0:8fa14d15e168 added hgignore |
257 |
258 () [default] draft |
258 HG: Conflicts while merging changeset description of content-divergent changesets. |
|
259 HG: Resolve conflicts in commit messages to continue. |
|
260 |
|
261 <<<<<<< divergent |
|
262 wat to d, wat?||||||| base |
|
263 foo to d======= |
|
264 bar to d, expect beers>>>>>>> other |
|
265 |
|
266 **done showing editors text** |
|
267 |
|
268 working directory is now at 00f8d08aea43 |
|
269 |
|
270 $ hg glog |
|
271 @ 16:00f8d08aea43 watbar to d |
|
272 | () [default] draft |
|
273 o 3:ca1b80f7960a added c |
|
274 | () [default] draft |
|
275 o 2:b1661037fa25 added b |
|
276 | () [default] draft |
|
277 o 1:c7586e2a9264 added a |
|
278 | () [default] draft |
|
279 o 0:8fa14d15e168 added hgignore |
|
280 () [default] draft |