Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-unrelated-pull.out @ 650:2c934c7b79dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug in reverting deleted files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix bug in reverting deleted files Force updates and reverts wouldn't restore deleted files in the working dir. This should fix that. manifest hash: e14809399bbc63da42e8c8f694cc8acf31e537f7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzjOJywK+sNU5EO8RAqVLAKCC1BF6JhNiO6n4LJGvy9RBTgOelwCdF9Tr sADRnovYt9xSnUGmd1Om9JQ= =SdcP -----END PGP SIGNATURE-----
author Matt Mackall <mpm@selenic.com>
date Fri, 08 Jul 2005 00:04:25 -0800
parents ffeb2c3a1966
children 122449dd89db 445970ccf57a
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 pulling from ../a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
2 searching for changes
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
3 warning: pulling from an unrelated repository!
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
4 adding changesets
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
5 adding manifests
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
6 adding file revisions
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
7 modified 1 files, added 1 changesets and 1 new revisions
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
8 (run 'hg update' to get a working copy)
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
9 changeset: 1:9a79c33a9db37480e40fbd2a65d62ebd2a3c441c
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
10 tag: tip
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
11 user: a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
12 date: Thu Jan 1 00:00:00 1970
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
13 summary: a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
14
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
15 changeset: 0:01f8062b2de51c0fa6428c5db1d1b3ea780189df
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
16 user: b
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
17 date: Thu Jan 1 00:00:00 1970
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
18 summary: b
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
19