Mercurial > hg

comparison tests/test-record.t @ 13023:3e2281b85990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
record: quote command in use hg commit message
author timeless <timeless@gmail.com>
date Sun, 21 Nov 2010 05:07:06 -0600
parents 8aeb6184b008
children d32e09769048
comparison
equal deleted inserted replaced
13022:3fd4e4e81382 13023:3e2281b85990
881 $ hg merge thatbranch 881 $ hg merge thatbranch
882 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 882 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
883 (branch merge, don't forget to commit) 883 (branch merge, don't forget to commit)
884 884
885 $ hg record -m'will abort' 885 $ hg record -m'will abort'
886 abort: cannot partially commit a merge (use hg commit instead) 886 abort: cannot partially commit a merge (use "hg commit" instead)
887 [255] 887 [255]
888 888
889 $ hg up -C 889 $ hg up -C
890 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 890 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
891 891