Mercurial > hg
comparison tests/test-fetch.out @ 6206:0b6f12495276
fetch: switch the default parent used for a merge
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.
The prior default behaviour is still available, via the --switch-parent
option.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Wed, 05 Mar 2008 09:10:45 -0800 |
| parents | 86f5d8f608b7 |
| children | 03b13d853dc6 |
comparison
equal
deleted
inserted
replaced
| 6205:b193a6e59131 | 6206:0b6f12495276 |
|---|---|
| 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 14 1:97d72e5f12c7 | 14 1:97d72e5f12c7 |
| 15 adding c | 15 adding c |
| 16 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 16 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 17 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 17 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 18 % should merge c into a | |
| 18 pulling from ../a | 19 pulling from ../a |
| 19 searching for changes | 20 searching for changes |
| 20 adding changesets | 21 adding changesets |
| 21 adding manifests | 22 adding manifests |
| 22 adding file changes | 23 adding file changes |
| 23 added 1 changesets with 1 changes to 1 files (+1 heads) | 24 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 24 merging with new head 2:97d72e5f12c7 | 25 updating to 2:97d72e5f12c7 |
| 26 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 27 merging with 1:5e056962225c | |
| 25 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 26 new changeset 3:cd3a41621cf0 merges remote changes with local | 29 new changeset 3:cd3a41621cf0 merges remote changes with local |
| 27 a | 30 a |
| 28 b | 31 b |
| 29 c | 32 c |
| 32 searching for changes | 35 searching for changes |
| 33 adding changesets | 36 adding changesets |
| 34 adding manifests | 37 adding manifests |
| 35 adding file changes | 38 adding file changes |
| 36 added 1 changesets with 1 changes to 1 files (+1 heads) | 39 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 37 merging with new head 2:97d72e5f12c7 | 40 updating to 2:97d72e5f12c7 |
| 41 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 42 merging with 1:5e056962225c | |
| 38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 39 new changeset 3:0b6439e938f9 merges remote changes with local | 44 new changeset 3:0b6439e938f9 merges remote changes with local |
| 40 Automated merge with http://localhost:20059/ | 45 Automated merge with http://localhost:20059/ |
| 41 % fetch over http with auth (should be hidden in desc) | 46 % fetch over http with auth (should be hidden in desc) |
| 42 pulling from http://user:***@localhost:20059/ | 47 pulling from http://user:***@localhost:20059/ |
| 43 searching for changes | 48 searching for changes |
| 44 adding changesets | 49 adding changesets |
| 45 adding manifests | 50 adding manifests |
| 46 adding file changes | 51 adding file changes |
| 47 added 1 changesets with 1 changes to 1 files (+1 heads) | 52 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 48 merging with new head 2:97d72e5f12c7 | 53 updating to 2:97d72e5f12c7 |
| 54 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 55 merging with 1:5e056962225c | |
| 49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 56 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 50 new changeset 3:0b6439e938f9 merges remote changes with local | 57 new changeset 3:0b6439e938f9 merges remote changes with local |
| 51 Automated merge with http://localhost:20059/ | 58 Automated merge with http://localhost:20059/ |
| 59 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 60 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 61 adding f | |
| 62 adding g | |
| 63 % should merge f into g | |
| 64 pulling from ../f | |
| 65 searching for changes | |
| 66 adding changesets | |
| 67 adding manifests | |
| 68 adding file changes | |
| 69 added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 70 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 71 merging with 3:cc6a3744834d | |
| 72 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 73 new changeset 4:96d2275e70b4 merges remote changes with local |