Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-pull @ 566:b2c9b36bd639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
repo.changes: fix duplicate changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 repo.changes: fix duplicate changes We need to discard the changed and added lists from dirstate.changes before adding to them when comparing manifests. Otherwise something that changed from rev->parent->working dir will appear twice. Bug spotted by Goffredo Baroncelli <kreijack@libero.it> manifest hash: 64c335e2fe6df6d1ce29d0903f16821c7566768f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxcT3ywK+sNU5EO8RAivLAJ4gqbWfMnt+BdyGac/ZGduy2KbNegCgncPV D4ay6Qw9sIodEPjRebvk3GE= =AZd2 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 01 Jul 2005 14:34:31 -0800
parents 4fc63e22b1fe
children d96c1153b25d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
544
3d4d5f2aba9a Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 522
diff changeset
1 #!/bin/sh
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
2
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
3 mkdir test
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
4 cd test
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
5 echo foo>foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
6 hg init
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
7 hg addremove
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
8 hg commit -t "1"
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
9 hg verify
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 350
diff changeset
10 hg serve -p 20059 2>/dev/null &
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
11 cd ..
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
12
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 392
diff changeset
13 hg clone http://localhost:20059/ copy
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
14 cd copy
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
15 hg verify
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
16 hg co
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
17 cat foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
18 hg manifest
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 495
diff changeset
19 hg pull
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
20
492
9bd468e36de3 Use "kill $!" to kill running background processes.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 485
diff changeset
21 kill $!