Mercurial > public > mercurial-scm > hg

diff tests/test-record @ 11237:feb2a58fc592 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Mon, 31 May 2010 17:13:15 +0900
parents 8b35b08724eb
children a5922547b5cc
line wrap: on
line diff
--- a/tests/test-record	Mon May 31 13:43:03 2010 +0200
+++ b/tests/test-record	Mon May 31 17:13:15 2010 +0900
@@ -297,9 +297,20 @@
 EOF
 echo; hg tip --config diff.git=True -p
 
+cd ..
+
+echo % abort early when a merge is in progress
+hg up 4
+touch iwillmergethat
+hg add iwillmergethat
+hg branch thatbranch
+hg ci -m'new head'
+hg up default
+hg merge thatbranch
+echo; hg record -m'will abort'
+hg up -C
 
 echo % with win32ext
-cd ..
 echo '[extensions]' >> .hg/hgrc
 echo 'win32text = ' >> .hg/hgrc
 echo '[decode]' >> .hg/hgrc