Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-unrelated-pull.out @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | ffeb2c3a1966 853bfbf1a312 |
children | 1f9ec150a476 |
comparison
equal
deleted
inserted
replaced
792:49ec802b4a16 | 793:445970ccf57a |
---|---|
1 pulling from ../a | 1 pulling from ../a |
2 searching for changes | 2 searching for changes |
3 warning: pulling from an unrelated repository! | 3 warning: pulling from an unrelated repository! |
4 adding changesets | 4 adding changesets |
5 adding manifests | 5 adding manifests |
6 adding file revisions | 6 adding file changes |
7 modified 1 files, added 1 changesets and 1 new revisions | 7 added 1 changesets with 1 changes to 1 files |
8 (run 'hg update' to get a working copy) | 8 (run 'hg update' to get a working copy) |
9 changeset: 1:9a79c33a9db37480e40fbd2a65d62ebd2a3c441c | 9 changeset: 1:9a79c33a9db3 |
10 tag: tip | 10 tag: tip |
11 user: a | 11 user: a |
12 date: Thu Jan 1 00:00:00 1970 | 12 date: Thu Jan 1 00:00:00 1970 |
13 summary: a | 13 summary: a |
14 | 14 |
15 changeset: 0:01f8062b2de51c0fa6428c5db1d1b3ea780189df | 15 changeset: 0:01f8062b2de5 |
16 user: b | 16 user: b |
17 date: Thu Jan 1 00:00:00 1970 | 17 date: Thu Jan 1 00:00:00 1970 |
18 summary: b | 18 summary: b |
19 | 19 |