Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-unrelated-pull @ 715:938dd667ca21
Make annotate use option --rev instead od --revision like other commands.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Make annotate use option --rev instead od --revision like other commands.
manifest hash: fe9c9cd9d42657f60d302b557f1f33640fd51199
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC2LAwW7P1GVgWeRoRAqYKAJ4tiLIVTRN0Ot6bjrEZRc9VFrk3zwCdGx/C
PhOGWMHVlNYGZxmdXridIc4=
=J7Cn
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 16 Jul 2005 07:58:56 +0100 |
parents | ffeb2c3a1966 |
children | 7e4843b7efd2 |
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 |