Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-unrelated-pull @ 580:353a2ce50423

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] New export patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] New export patch From: Bryan O'Sullivan <bos@serpentine.com> Modify export command to accept rev ranges and output file spec. It can now export a range of revisions, and print exported patches to files whose names are generated using format strings. manifest hash: e0085c205cdc31a168bcd25c85772ef00d53031d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx02iywK+sNU5EO8RAtCKAJ0V2K9+i1OGa27KyC5/nq3m+OdvtgCgpnav 3vfEODMzJVOZoJt9wzI1UCg= =YAdI -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 18:29:54 -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