Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-fetch.out @ 3044:fcadf7a32425
Merge with mpm
author | Josef "Jeff" Sipek <jeffpc@josefsipek.net> |
---|---|
date | Sun, 03 Sep 2006 06:06:02 -0400 |
parents | e0caea53c997 |
children |
comparison
equal
deleted
inserted
replaced
3043:2a4d4aecb2b4 | 3044:fcadf7a32425 |
---|---|
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 |