Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-pull @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents e3a0c092b4e2
children
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
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 642
diff changeset
8 hg commit -m 1
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
9 hg verify
5384
e3a0c092b4e2 Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4888
diff changeset
10 hg serve -p $HGPORT -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
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
12 cd ..
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
13
5384
e3a0c092b4e2 Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4888
diff changeset
14 http_proxy= hg clone --pull http://localhost:$HGPORT/ copy | sed -e 's,:[0-9][0-9]*/,/,'
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
15 cd copy
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
16 hg verify
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
17 hg co
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
18 cat foo
3736
ad3d5b4367cb make manifest friendlier
Matt Mackall <mpm@selenic.com>
parents: 2612
diff changeset
19 hg manifest --debug
5384
e3a0c092b4e2 Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4888
diff changeset
20 hg pull | sed -e 's,:[0-9][0-9]*/,/,'
4888
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 3736
diff changeset
21
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 3736
diff changeset
22 echo % issue 622
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 3736
diff changeset
23 cd ..
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 3736
diff changeset
24 hg init empty
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 3736
diff changeset
25 cd empty
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 3736
diff changeset
26 hg pull -u ../test