Mercurial > hg
comparison tests/test-rename-merge2.t @ 20945:18adc15635a1
merge: keep destination filename as key in filemerge actions
Gives more readable debug output and makes it possible to compare/merge actions
later.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sun, 02 Mar 2014 18:52:16 +0100 |
| parents | 3db9e798e004 |
| children | 7731a2281cf0 |
comparison
equal
deleted
inserted
replaced
| 20944:5b8d5803d7b7 | 20945:18adc15635a1 |
|---|---|
| 84 src: 'a' -> dst: 'b' * | 84 src: 'a' -> dst: 'b' * |
| 85 checking for directory renames | 85 checking for directory renames |
| 86 resolving manifests | 86 resolving manifests |
| 87 branchmerge: True, force: False, partial: False | 87 branchmerge: True, force: False, partial: False |
| 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 | 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
| 89 a: remote copied to b -> m | 89 b: remote copied from a -> m |
| 90 preserving a for resolve of b | 90 preserving a for resolve of b |
| 91 rev: versions differ -> m | 91 rev: versions differ -> m |
| 92 preserving rev for resolve of rev | 92 preserving rev for resolve of rev |
| 93 updating: a 1/2 files (50.00%) | 93 updating: b 1/2 files (50.00%) |
| 94 picked tool 'python ../merge' for b (binary False symlink False) | 94 picked tool 'python ../merge' for b (binary False symlink False) |
| 95 merging a and b to b | 95 merging a and b to b |
| 96 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 | 96 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
| 97 premerge successful | 97 premerge successful |
| 98 updating: rev 2/2 files (100.00%) | 98 updating: rev 2/2 files (100.00%) |
| 120 checking for directory renames | 120 checking for directory renames |
| 121 resolving manifests | 121 resolving manifests |
| 122 branchmerge: True, force: False, partial: False | 122 branchmerge: True, force: False, partial: False |
| 123 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 | 123 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 |
| 124 a: remote is newer -> g | 124 a: remote is newer -> g |
| 125 b: local copied/moved to a -> m | 125 b: local copied/moved from a -> m |
| 126 preserving b for resolve of b | 126 preserving b for resolve of b |
| 127 rev: versions differ -> m | 127 rev: versions differ -> m |
| 128 preserving rev for resolve of rev | 128 preserving rev for resolve of rev |
| 129 getting a | 129 getting a |
| 130 updating: a 1/3 files (33.33%) | 130 updating: a 1/3 files (33.33%) |
| 157 src: 'a' -> dst: 'b' * | 157 src: 'a' -> dst: 'b' * |
| 158 checking for directory renames | 158 checking for directory renames |
| 159 resolving manifests | 159 resolving manifests |
| 160 branchmerge: True, force: False, partial: False | 160 branchmerge: True, force: False, partial: False |
| 161 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a | 161 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a |
| 162 a: remote moved to b -> m | 162 b: remote moved from a -> m |
| 163 preserving a for resolve of b | 163 preserving a for resolve of b |
| 164 rev: versions differ -> m | 164 rev: versions differ -> m |
| 165 preserving rev for resolve of rev | 165 preserving rev for resolve of rev |
| 166 removing a | 166 removing a |
| 167 updating: a 1/2 files (50.00%) | 167 updating: b 1/2 files (50.00%) |
| 168 picked tool 'python ../merge' for b (binary False symlink False) | 168 picked tool 'python ../merge' for b (binary False symlink False) |
| 169 merging a and b to b | 169 merging a and b to b |
| 170 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 | 170 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
| 171 premerge successful | 171 premerge successful |
| 172 updating: rev 2/2 files (100.00%) | 172 updating: rev 2/2 files (100.00%) |
| 192 src: 'a' -> dst: 'b' * | 192 src: 'a' -> dst: 'b' * |
| 193 checking for directory renames | 193 checking for directory renames |
| 194 resolving manifests | 194 resolving manifests |
| 195 branchmerge: True, force: False, partial: False | 195 branchmerge: True, force: False, partial: False |
| 196 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 | 196 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
| 197 b: local copied/moved to a -> m | 197 b: local copied/moved from a -> m |
| 198 preserving b for resolve of b | 198 preserving b for resolve of b |
| 199 rev: versions differ -> m | 199 rev: versions differ -> m |
| 200 preserving rev for resolve of rev | 200 preserving rev for resolve of rev |
| 201 updating: b 1/2 files (50.00%) | 201 updating: b 1/2 files (50.00%) |
| 202 picked tool 'python ../merge' for b (binary False symlink False) | 202 picked tool 'python ../merge' for b (binary False symlink False) |
| 670 src: 'a' -> dst: 'b' * | 670 src: 'a' -> dst: 'b' * |
| 671 checking for directory renames | 671 checking for directory renames |
| 672 resolving manifests | 672 resolving manifests |
| 673 branchmerge: True, force: False, partial: False | 673 branchmerge: True, force: False, partial: False |
| 674 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 | 674 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 |
| 675 a: remote moved to b -> m | 675 b: remote moved from a -> m |
| 676 preserving a for resolve of b | 676 preserving a for resolve of b |
| 677 rev: versions differ -> m | 677 rev: versions differ -> m |
| 678 preserving rev for resolve of rev | 678 preserving rev for resolve of rev |
| 679 removing a | 679 removing a |
| 680 updating: a 1/2 files (50.00%) | 680 updating: b 1/2 files (50.00%) |
| 681 picked tool 'python ../merge' for b (binary False symlink False) | 681 picked tool 'python ../merge' for b (binary False symlink False) |
| 682 merging a and b to b | 682 merging a and b to b |
| 683 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 | 683 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
| 684 updating: rev 2/2 files (100.00%) | 684 updating: rev 2/2 files (100.00%) |
| 685 picked tool 'python ../merge' for rev (binary False symlink False) | 685 picked tool 'python ../merge' for rev (binary False symlink False) |
| 704 src: 'a' -> dst: 'b' * | 704 src: 'a' -> dst: 'b' * |
| 705 checking for directory renames | 705 checking for directory renames |
| 706 resolving manifests | 706 resolving manifests |
| 707 branchmerge: True, force: False, partial: False | 707 branchmerge: True, force: False, partial: False |
| 708 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 | 708 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
| 709 b: local copied/moved to a -> m | 709 b: local copied/moved from a -> m |
| 710 preserving b for resolve of b | 710 preserving b for resolve of b |
| 711 rev: versions differ -> m | 711 rev: versions differ -> m |
| 712 preserving rev for resolve of rev | 712 preserving rev for resolve of rev |
| 713 updating: b 1/2 files (50.00%) | 713 updating: b 1/2 files (50.00%) |
| 714 picked tool 'python ../merge' for b (binary False symlink False) | 714 picked tool 'python ../merge' for b (binary False symlink False) |
| 742 src: 'a' -> dst: 'b' * | 742 src: 'a' -> dst: 'b' * |
| 743 checking for directory renames | 743 checking for directory renames |
| 744 resolving manifests | 744 resolving manifests |
| 745 branchmerge: True, force: False, partial: False | 745 branchmerge: True, force: False, partial: False |
| 746 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f | 746 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f |
| 747 b: local copied/moved to a -> m | 747 b: local copied/moved from a -> m |
| 748 preserving b for resolve of b | 748 preserving b for resolve of b |
| 749 c: remote created -> g | 749 c: remote created -> g |
| 750 rev: versions differ -> m | 750 rev: versions differ -> m |
| 751 preserving rev for resolve of rev | 751 preserving rev for resolve of rev |
| 752 getting c | 752 getting c |
| 840 preserving 1/g for resolve of 1/g | 840 preserving 1/g for resolve of 1/g |
| 841 2/f: versions differ -> m | 841 2/f: versions differ -> m |
| 842 preserving 2/f for resolve of 2/f | 842 preserving 2/f for resolve of 2/f |
| 843 3/f: versions differ -> m | 843 3/f: versions differ -> m |
| 844 preserving 3/f for resolve of 3/f | 844 preserving 3/f for resolve of 3/f |
| 845 3/f: remote copied to 3/g -> m | 845 3/g: remote copied from 3/f -> m |
| 846 preserving 3/f for resolve of 3/g | 846 preserving 3/f for resolve of 3/g |
| 847 4/f: remote moved to 4/g -> m | 847 4/g: remote moved from 4/f -> m |
| 848 preserving 4/f for resolve of 4/g | 848 preserving 4/f for resolve of 4/g |
| 849 5/f: versions differ -> m | 849 5/f: versions differ -> m |
| 850 preserving 5/f for resolve of 5/f | 850 preserving 5/f for resolve of 5/f |
| 851 5/g: local copied/moved to 5/f -> m | 851 5/g: local copied/moved from 5/f -> m |
| 852 preserving 5/g for resolve of 5/g | 852 preserving 5/g for resolve of 5/g |
| 853 6/g: local copied/moved to 6/f -> m | 853 6/g: local copied/moved from 6/f -> m |
| 854 preserving 6/g for resolve of 6/g | 854 preserving 6/g for resolve of 6/g |
| 855 7/f: remote differs from untracked local -> m | 855 7/f: remote differs from untracked local -> m |
| 856 preserving 7/f for resolve of 7/f | 856 preserving 7/f for resolve of 7/f |
| 857 8/f: prompt recreating -> g | 857 8/f: prompt recreating -> g |
| 858 removing 4/f | 858 removing 4/f |