Mercurial > hg
comparison tests/test-rename-merge1.t @ 18631:e2dc5397bc82
tests: update test output (will be folded into parent)
| author | Bryan O'Sullivan <bryano@fb.com> |
|---|---|
| date | Sat, 09 Feb 2013 15:22:04 -0800 |
| parents | bcf29565d89f |
| children | 18adc15635a1 |
comparison
equal
deleted
inserted
replaced
| 18630:9b9e2d9e83a1 | 18631:e2dc5397bc82 |
|---|---|
| 39 a: remote moved to b -> m | 39 a: remote moved to b -> m |
| 40 preserving a for resolve of b | 40 preserving a for resolve of b |
| 41 a2: divergent renames -> dr | 41 a2: divergent renames -> dr |
| 42 b2: remote created -> g | 42 b2: remote created -> g |
| 43 removing a | 43 removing a |
| 44 updating: a 1/3 files (33.33%) | 44 getting b2 |
| 45 updating: b2 1/3 files (33.33%) | |
| 46 updating: a 2/3 files (66.67%) | |
| 45 picked tool 'internal:merge' for b (binary False symlink False) | 47 picked tool 'internal:merge' for b (binary False symlink False) |
| 46 merging a and b to b | 48 merging a and b to b |
| 47 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c | 49 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
| 48 premerge successful | 50 premerge successful |
| 49 updating: a2 2/3 files (66.67%) | 51 updating: a2 3/3 files (100.00%) |
| 50 note: possible conflict - a2 was renamed multiple times to: | 52 note: possible conflict - a2 was renamed multiple times to: |
| 51 c2 | 53 c2 |
| 52 b2 | 54 b2 |
| 53 updating: b2 3/3 files (100.00%) | |
| 54 getting b2 | |
| 55 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 55 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 56 (branch merge, don't forget to commit) | 56 (branch merge, don't forget to commit) |
| 57 | 57 |
| 58 $ hg status -AC | 58 $ hg status -AC |
| 59 M b | 59 M b |
| 181 resolving manifests | 181 resolving manifests |
| 182 branchmerge: True, force: False, partial: False | 182 branchmerge: True, force: False, partial: False |
| 183 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 | 183 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 |
| 184 file: rename and delete -> rd | 184 file: rename and delete -> rd |
| 185 newfile: remote created -> g | 185 newfile: remote created -> g |
| 186 updating: file 1/2 files (50.00%) | 186 getting newfile |
| 187 updating: newfile 1/2 files (50.00%) | |
| 188 updating: file 2/2 files (100.00%) | |
| 187 note: possible conflict - file was deleted and renamed to: | 189 note: possible conflict - file was deleted and renamed to: |
| 188 newfile | 190 newfile |
| 189 updating: newfile 2/2 files (100.00%) | |
| 190 getting newfile | |
| 191 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 191 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 192 (branch merge, don't forget to commit) | 192 (branch merge, don't forget to commit) |
| 193 $ hg status | 193 $ hg status |
| 194 M newfile | 194 M newfile |
| 195 $ cd .. | 195 $ cd .. |