Mercurial > hg
view tests/test-abort-checkin @ 4416:bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 May 2007 02:59:13 -0500 |
parents | 61fcd9fac434 |
children | 193e0f8d9a47 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH cat > $HGTMP/false <<EOF #!/bin/sh exit 1 EOF chmod +x $HGTMP/false hg init foo cd foo echo foo > foo hg add foo # mq may keep a reference to the repository so __del__ will not be called # and .hg/journal.dirstate will not be deleted: HGEDITOR=$HGTMP/false hg ci HGEDITOR=$HGTMP/false hg ci exit 0