Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5 @ 558:0ceea19182a9
transaction: __del__ should do nothing if the journal already exists
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
transaction: __del__ should do nothing if the journal already exists
manifest hash: c85f747ca762b7c446d306cbd7a20f8e566557fb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxXbTywK+sNU5EO8RAvjsAKCcTSzN9OjtoAdaZgtjDs9380ia7ACfcXsx
FcNESqr4nX9b97WTGszJs48=
=C2sL
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 01 Jul 2005 09:01:07 -0800 |
parents | c2b9502a4e96 |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh -x mkdir t cd t hg init echo This is file a1 > a echo This is file b1 > b hg add a b hg commit -t "commit #0" -d "0 0" -u user echo This is file b22 > b hg commit -t"comment #1" -d "0 0" -u user hg update 0 rm b hg commit -A -t"comment #2" -d "0 0" -u user # in theory, we shouldn't need the "yes k" below, but it prevents # this test from hanging when "hg update" erroneously prompts the # user for "keep or delete" yes k | hg update 1 # we exit with 0 to avoid the unavoidable SIGPIPE from above causing # us to fail this test exit 0