Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 573:fbfbd4e506c3
transaction: nullify journal after close()
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
transaction: nullify journal after close()
This keeps us from trying to cleanup in __del__.
bug spotted by K Thananchayan <thananck@yahoo.com>
manifest hash: 1f4c5fa43d2458cdcb6ec0f0a7066b3c3e699f33
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxwQ6ywK+sNU5EO8RAuGhAJ9+BnKILwRCF9EKlPTz2zptiysQ/QCgsB3s
VKIehiStv+ibWQQi15k4mwk=
=nZD1
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 02 Jul 2005 13:16:42 -0800 |
parents | 4fc63e22b1fe |
children | eb46971fc57f |
line wrap: on
line source
#!/bin/sh set -x hg init echo "nothing" > a hg add a hg commit -t ancestor -u test -d "0 0" echo "something" > a hg commit -t branch1 -u test -d "0 0" hg co 0 echo "something else" > a hg commit -t branch2 -u test -d "0 0" export HGMERGE=merge hg -d up -m 1 hg id grep -Ev ">>>|<<<" a hg status