Mercurial > hg
view tests/test-imerge @ 5534:61c230f81068
mq: avoid qnew committing everything on invalid paths (issue 803)
If paths are supplied but resolve to nothing, localrepo.commit() is called with an empty set and commits the whole dirstate. Avoid this by passing the match function to commit.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Tue, 20 Nov 2007 14:31:58 +0100 |
parents | 9cd6578750b9 |
children | 5c5e45766224 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "imerge=" >> $HGRCPATH HGMERGE=true export HGMERGE hg init base cd base echo foo > foo echo bar > bar hg ci -Am0 -d '0 0' hg mv foo foo2 echo foo >> foo2 hg ci -m1 -d '1 0' hg up -C 0 echo bar >> foo echo bar >> bar hg ci -m2 -d '2 0' echo % start imerge hg imerge cat foo2 cat bar echo % status -v hg -v imerge st echo % next hg imerge next echo % merge next hg --traceback imerge echo % unresolve hg imerge unres foo echo % merge foo hg imerge merge foo echo % save echo foo > foo2 hg imerge save ../savedmerge echo % load hg up -C 0 hg imerge --traceback load ../savedmerge cat foo2 hg ci -m'merged' -d '3 0' hg tip -v echo % nothing to merge -- tip hg imerge hg up 0 echo % nothing to merge hg imerge exit 0