Mercurial > hg
view tests/test-resolve @ 7812:18048153fd4e
test-convert-cvs*: mute output from "cvs up"
Apparently some versions of cvs outputs more than other versions. That is
however not relevant for these tests.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Fri, 27 Feb 2009 17:52:31 +0100 |
parents | 9f73bddb9d0b |
children | 6c82beaaa11a |
line wrap: on
line source
#!/bin/sh # test that a commit clears the merge state. hg init repo cd repo echo foo > file hg commit -Am 'add file' -d '0 0' echo bar >> file hg commit -Am 'append bar' -d '0 0' echo % create a second head hg up -C 0 echo baz >> file hg commit -Am 'append baz' -d '0 0' echo % failing merge HGMERGE=internal:fail hg merge echo resolved > file hg resolve -m file hg commit -m 'resolved' -d '0 0' echo % resolve -l, should be empty hg resolve -l