Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-hook.out @ 3200:e67c22bc8bba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use repo.parents and parent contexts in update
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Sep 2006 16:39:38 -0500
parents eef469259745
children 961ccb615cf7
comparison
equal deleted inserted replaced
3199:ebdb3f616bc0 3200:e67c22bc8bba
60 4:8ea2ef7ad3e8 60 4:8ea2ef7ad3e8
61 precommit hook: p1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 p2= 61 precommit hook: p1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 p2=
62 precommit.forbid hook 62 precommit.forbid hook
63 abort: precommit.forbid hook exited with status 1 63 abort: precommit.forbid hook exited with status 1
64 4:8ea2ef7ad3e8 64 4:8ea2ef7ad3e8
65 preupdate hook: p1=b702efe9688826e3a91283852b328b84dbf37bc2 p2= 65 preupdate hook: p1=b702efe96888 p2=
66 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 66 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
67 preupdate hook: p1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 p2= 67 preupdate hook: p1=8ea2ef7ad3e8 p2=
68 update hook: p1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 p2= err=0 68 update hook: p1=8ea2ef7ad3e8 p2= err=0
69 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 69 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
70 3:4c52fb2e4022 70 3:4c52fb2e4022
71 prechangegroup.forbid hook 71 prechangegroup.forbid hook
72 pulling from ../a 72 pulling from ../a
73 searching for changes 73 searching for changes