view tests/test-resolve @ 11097:9651fa5a3cbf

context: add a changectx.diff() convenience function

With this function, extracting diffs becomes trivial:

repo = hg.repository(ui.ui(), path=root)
ctx = repo['tip']
for out in ctx.diff():  print out

#!/bin/sh

# test that a commit clears the merge state.

hg init repo
cd repo

echo foo > file
hg commit -Am 'add file'

echo bar >> file
hg commit -Am 'append bar'

echo % create a second head
hg up -C 0
echo baz >> file
hg commit -Am 'append baz'

echo % failing merge
HGMERGE=internal:fail hg merge

echo resolved > file
hg resolve -m file
hg commit -m 'resolved'

echo % resolve -l, should be empty
hg resolve -l