Mercurial > hg
comparison tests/test-fetch.out @ 2830:49988d9f0758
Merge with crew, fix most tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 09 Aug 2006 13:55:18 -0500 |
parents | e0caea53c997 |
children | 86f5d8f608b7 |
comparison
equal
deleted
inserted
replaced
2815:4870f795f681 | 2830:49988d9f0758 |
---|---|
1 adding a | |
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 adding b | |
5 1:97d72e5f12c7 | |
6 % should pull one change | |
7 pulling from ../a | |
8 searching for changes | |
9 adding changesets | |
10 adding manifests | |
11 adding file changes | |
12 added 1 changesets with 1 changes to 1 files | |
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 1:97d72e5f12c7 | |
15 adding c | |
16 pulling from ../a | |
17 searching for changes | |
18 adding changesets | |
19 adding manifests | |
20 adding file changes | |
21 added 1 changesets with 1 changes to 1 files (+1 heads) | |
22 merging with new head 2:97d72e5f12c7 | |
23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
24 new changeset 3:cd3a41621cf0 merges remote changes with local | |
25 a | |
26 b | |
27 c |