Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-unrelated-pull.out @ 925:5a034646e472
run-tests: remove '+ hg' trick
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
author | mpm@selenic.com |
---|---|
date | Tue, 16 Aug 2005 19:03:01 -0800 |
parents | 0902ffece4b4 |
children | 1f3710636b45 4f81068ed8cd |
comparison
equal
deleted
inserted
replaced
924:ab681ea2857e | 925:5a034646e472 |
---|---|
1 + hg init | |
2 + hg add a | |
3 + hg commit -m a -u a -d 0 0 | |
4 + hg init | |
5 + hg add b | |
6 + hg commit -m b -u b -d 0 0 | |
7 + hg pull ../a | |
8 pulling from ../a | 1 pulling from ../a |
9 searching for changes | 2 searching for changes |
10 warning: pulling from an unrelated repository! | 3 warning: pulling from an unrelated repository! |
11 adding changesets | 4 adding changesets |
12 adding manifests | 5 adding manifests |
13 adding file changes | 6 adding file changes |
14 added 1 changesets with 1 changes to 1 files | 7 added 1 changesets with 1 changes to 1 files |
15 (run 'hg update' to get a working copy) | 8 (run 'hg update' to get a working copy) |
16 + hg heads | |
17 changeset: 1:9a79c33a9db3 | 9 changeset: 1:9a79c33a9db3 |
18 tag: tip | 10 tag: tip |
19 user: a | 11 user: a |
20 date: Thu Jan 1 00:00:00 1970 | 12 date: Thu Jan 1 00:00:00 1970 |
21 summary: a | 13 summary: a |