Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-unrelated-pull @ 625:978011cf5279

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups for repo.pull Use repo.pull in pull and clone commands Teach clone about ssh:// (temporarily) Fix up shutil issue on failed pull
author Matt Mackall <mpm@selenic.com>
date Tue, 05 Jul 2005 18:12:57 -0800
parents ffeb2c3a1966
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
1 mkdir a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
2 cd a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
3 hg init
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
4 echo 123 > a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
5 hg add a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
6 hg commit -t "a" -u a -d "0 0"
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
7
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
8 cd ..
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
9 mkdir b
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
10 cd b
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
11 hg init
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
12 echo 321 > b
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
13 hg add b
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
14 hg commit -t "b" -u b -d "0 0"
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
15
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
16 hg pull ../a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
17 hg heads