Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-bundle.out @ 3044:fcadf7a32425
Merge with mpm
author | Josef "Jeff" Sipek <jeffpc@josefsipek.net> |
---|---|
date | Sun, 03 Sep 2006 06:06:02 -0400 |
parents | 400a4a502001 |
children | b19360aa21e9 |
comparison
equal
deleted
inserted
replaced
3043:2a4d4aecb2b4 | 3044:fcadf7a32425 |
---|---|
9 adding changesets | 9 adding changesets |
10 adding manifests | 10 adding manifests |
11 adding file changes | 11 adding file changes |
12 added 0 changesets with 0 changes to 4 files | 12 added 0 changesets with 0 changes to 4 files |
13 (run 'hg update' to get a working copy) | 13 (run 'hg update' to get a working copy) |
14 adding changesets | 14 changeset: -1:000000000000 |
15 adding manifests | 15 tag: tip |
16 adding file changes | 16 user: |
17 added 9 changesets with 7 changes to 4 files (+1 heads) | 17 date: Thu Jan 01 00:00:00 1970 +0000 |
18 (run 'hg heads' to see heads, 'hg merge' to merge) | |
19 changeset: 8:836ac62537ab | |
20 tag: tip | |
21 parent: 3:ac69c658229d | |
22 user: test | |
23 date: Mon Jan 12 13:46:40 1970 +0000 | |
24 summary: 0.3m | |
25 | |
26 changeset: 7:80fe151401c2 | |
27 user: test | |
28 date: Mon Jan 12 13:46:40 1970 +0000 | |
29 summary: 1.3m | |
30 | 18 |
31 checking changesets | 19 checking changesets |
32 checking manifests | 20 checking manifests |
33 crosschecking files in changesets and manifests | 21 crosschecking files in changesets and manifests |
34 checking files | 22 checking files |
35 4 files, 9 changesets, 7 total revisions | 23 0 files, 0 changesets, 0 total revisions |
24 pulling from ../full.hg | |
25 searching for changes | |
26 no changes found | |
27 pulling from ../full.hg | |
28 requesting all changes | |
29 adding changesets | |
30 adding manifests | |
31 adding file changes | |
32 added 9 changesets with 7 changes to 4 files (+1 heads) | |
33 (run 'hg heads' to see heads, 'hg merge' to merge) | |
34 rolling back last transaction | |
35 pulling from ../full.hg | |
36 requesting all changes | |
37 adding changesets | |
38 adding manifests | |
39 adding file changes | |
40 added 9 changesets with 7 changes to 4 files (+1 heads) | |
41 (run 'hg heads' to see heads, 'hg merge' to merge) | |
36 changeset: 8:836ac62537ab | 42 changeset: 8:836ac62537ab |
37 tag: tip | 43 tag: tip |
38 parent: 3:ac69c658229d | 44 parent: 3:ac69c658229d |
39 user: test | 45 user: test |
40 date: Mon Jan 12 13:46:40 1970 +0000 | 46 date: Mon Jan 12 13:46:40 1970 +0000 |