Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-hook @ 768:20e95c245bc3
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
author | mpm@selenic.com |
---|---|
date | Sat, 23 Jul 2005 10:00:56 -0500 |
parents | 7e4843b7efd2 |
children | ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4 |
rev | line source |
---|---|
487 | 1 #!/bin/sh -x |
2 | |
3 hg init | |
4 echo "[hooks]" > .hg/hgrc | |
5 echo 'precommit = echo precommit hook' >> .hg/hgrc | |
6 echo 'commit = echo commit hook: $NODE' >> .hg/hgrc | |
7 echo a > a | |
8 hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
487
diff
changeset
|
9 hg commit -m "test" -d "0 0" |