Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-pull @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | ffb895f16925 |
children | ad3d5b4367cb |
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 | 2 |
3 mkdir test | |
4 cd test | |
5 echo foo>foo | |
6 hg init | |
7 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
642
diff
changeset
|
8 hg commit -m 1 |
336 | 9 hg verify |
1786
ffb584a182d1
Don't use mktemp in tests, we're already in a secure temp dir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1744
diff
changeset
|
10 hg serve -p 20059 -d --pid-file=hg.pid |
2570
83cfd95eafb5
tests: add timeouts, make run-tests.py clean up dead daemon processes
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1929
diff
changeset
|
11 cat hg.pid >> $DAEMON_PIDS |
336 | 12 cd .. |
13 | |
2612
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2570
diff
changeset
|
14 http_proxy= hg clone --pull http://localhost:20059/ copy |
336 | 15 cd copy |
16 hg verify | |
17 hg co | |
18 cat foo | |
19 hg manifest | |
522
2f1de824798a
Fix empty pull bug that appeared this morning
mpm@selenic.com
parents:
495
diff
changeset
|
20 hg pull |