Mercurial > public > mercurial-scm > hg-stable

diff tests/test-convert-svn-sink @ 6888:7c36a4fb05a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make commit fail when committing unresolved files
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
date Wed, 13 Aug 2008 20:18:40 -0500
parents c1b47c0fd2b6
children dbc40381620e
line wrap: on
line diff
--- a/tests/test-convert-svn-sink	Wed Aug 13 20:18:40 2008 -0500
+++ b/tests/test-convert-svn-sink	Wed Aug 13 20:18:40 2008 -0500
@@ -128,6 +128,7 @@
 hg --cwd b up -C 2
 hg --cwd b merge
 hg --cwd b revert -r 2 b
+hg resolve -m b
 hg --cwd b ci -d '5 0' -m 'merge'
 
 hg convert -d svn b