Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-transplant.out @ 4036:ebf1a05f6479
Make test-transplant test pull case
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 16 Jan 2007 12:52:03 -0800 |
parents | 889f7e74a0d9 |
children | 27414950abf5 |
comparison
equal
deleted
inserted
replaced
4035:c8f26bd24e86 | 4036:ebf1a05f6479 |
---|---|
73 adding b4 | 73 adding b4 |
74 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | 74 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
75 searching for changes | 75 searching for changes |
76 applying 4333daefcb15 | 76 applying 4333daefcb15 |
77 4333daefcb15 transplanted to 5f42c04e07cc | 77 4333daefcb15 transplanted to 5f42c04e07cc |
78 % remote transplant with pull | |
79 requesting all changes | |
80 adding changesets | |
81 adding manifests | |
82 adding file changes | |
83 added 1 changesets with 1 changes to 1 files | |
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
85 searching for changes | |
86 searching for changes | |
87 adding changesets | |
88 adding manifests | |
89 adding file changes | |
90 added 1 changesets with 1 changes to 1 files | |
91 applying a53251cdf717 | |
92 a53251cdf717 transplanted to 8d9279348abb | |
93 2 b3 | |
94 1 b1 | |
95 0 r1 | |
78 % transplant --continue | 96 % transplant --continue |
79 adding foo | 97 adding foo |
80 adding toremove | 98 adding toremove |
81 adding added | 99 adding added |
82 removing toremove | 100 removing toremove |