Mercurial > evolve

comparison tests/test-prev-next.t @ 4071:12c29a0fb472 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-output: backout test output update in 503ae2689df8
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 Sep 2018 17:20:28 +0200
parents 503ae2689df8
children 73f22dc3bbbe f9a850018daa
comparison
equal deleted inserted replaced
4070:c53bf38e2e5a 4071:12c29a0fb472
458 458
459 Testing --merge works with other values of commands.update.check also 459 Testing --merge works with other values of commands.update.check also
460 460
461 XXX: things are broken! 461 XXX: things are broken!
462 $ hg prev --merge --config commands.update.check=abort 462 $ hg prev --merge --config commands.update.check=abort
463 file 'bar' was deleted in other [destination] but was modified in local [working copy]. 463 local [working copy] changed bar which other [destination] deleted
464 What do you want to do?
465 use (c)hanged version, (d)elete, or leave (u)nresolved? 464 use (c)hanged version, (d)elete, or leave (u)nresolved?
466 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 465 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
467 use 'hg resolve' to retry unresolved file merges 466 use 'hg resolve' to retry unresolved file merges
468 [1] added foo 467 [1] added foo
469 468