hgbook

diff en/examples/hook.simple.pretxncommit.out @ 302:e281bd9a8e47

find changesets by author, revision, files, or words in the commit message
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 22:00:46 2008 +0200 (2008-08-20)
parents 006bbad1f190
children
line diff
     1.1 --- a/en/examples/hook.simple.pretxncommit.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/hook.simple.pretxncommit.out	Wed Aug 20 22:00:46 2008 +0200
     1.3 @@ -5,9 +5,9 @@
     1.4  $ \textbf{echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc}
     1.5  $ \textbf{echo a >> a}
     1.6  $ \textbf{hg commit -m 'i am not mentioning a bug id'}
     1.7 -abort: pretxncommit.bug_id_required hook exited with status 1
     1.8  transaction abort!
     1.9  rollback completed
    1.10 +abort: pretxncommit.bug_id_required hook exited with status 1
    1.11  $ \textbf{hg commit -m 'i refer you to bug 666'}
    1.12  committed 
    1.13