Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-flags @ 412:40cfa2d0c088
[PATCH]: Typo in localrepository.update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH]: Typo in localrepository.update
From: Goffredo Baroncelli <kreijack@libero.it>
I think that there is an error in the method update() of the class
localrepository. The variable 'm2n' was used instead of 'man'; so the
parent2 flags is computed instead of the ancestor flags.
manifest hash: dc11810367615245c4b39660d135ab3c0e71b85d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNWpywK+sNU5EO8RAv9ZAKCxwbd242xZQ1CCrW2WDdQ4gclKtACghXYl
7j1YTRpINItwdXzak3cBS60=
=+Tf8
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 19:06:17 -0800 |
parents | |
children | 291a62848f54 |
line wrap: on
line diff
new file mode 100755 --- /dev/null +++ b/tests/test-flags @@ -0,0 +1,35 @@ +#!/bin/sh +ex + +mkdir test1 +cd test1 + +hg init +touch a b +hg add a b +hg ci -t "added a b" -u test -d "0 0" + +cd .. +mkdir test2 +cd test2 + +hg init +hg merge ../test1 +hg co +chmod +x a +hg ci -t "chmod +x a" -u test -d "0 0" + +cd ../test1 +echo 123 >>a +hg ci -t "a updated" -u test -d "0 0" + +ls -l ../test[12]/a + +hg merge ../test2 +hg heads +hg history + +hg -dv co -m + +ls -l ../test[12]/a > foo +cut -b 0-10 < foo +