Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict @ 576:da11baf5de7b
Handle unknown files better on update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Handle unknown files better on update
If we spot an unknown file that's identical to one that's in the
update, we get the updated one so that it shows up in the dirstate
properly.
manifest hash: 988aca64f255df67c27d1c6f8694ea098e4ec159
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxyFyywK+sNU5EO8RAjmiAKCTgINXMPB1CxHt0OgHYPucfjCS7QCcDpJJ
VgKqZS54hTAWN3jL2yllUhI=
=iPQD
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Sat, 02 Jul 2005 15:21:22 -0800 |
| parents | 4fc63e22b1fe |
| children | eb46971fc57f |
| rev | line source |
|---|---|
|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
392
diff
changeset
|
1 #!/bin/sh |
| 346 | 2 |
| 3 set -x | |
| 4 hg init | |
| 5 echo "nothing" > a | |
| 6 hg add a | |
| 7 hg commit -t ancestor -u test -d "0 0" | |
| 8 echo "something" > a | |
| 9 hg commit -t branch1 -u test -d "0 0" | |
| 10 hg co 0 | |
| 11 echo "something else" > a | |
| 12 hg commit -t branch2 -u test -d "0 0" | |
| 13 export HGMERGE=merge | |
| 14 hg -d up -m 1 | |
| 15 hg id | |
| 392 | 16 grep -Ev ">>>|<<<" a |
| 346 | 17 hg status |