view tests/test-merge-commit.out @ 11965:77f1f206e135 stable

mq: don't inherit default and default-push paths with --mq (issue2333)

Configuration from the outer repo is inherited to the patches repo when --mq is
used.

In case the patches repo only has paths.default configured but the outer repo
has paths.default-push then the inherited default-push will win. Very
confusing.

Inheriting the default paths is however wrong in all sane cases, so now we
explicitly remove them.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging bar and foo to bar
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% contents of bar should be line0 line1 line2
line0
line1
line2
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0      77      0       2 d35118874825 000000000000 000000000000
     1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       7      0       0 690b295714ae 000000000000 000000000000
     1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
4:2263c1be0967 2:0f2ff26688b9 
3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d 
2:0f2ff26688b9 0:2665aaee66e9 
1:5cd961e4045d 
0:2665aaee66e9 
% this should use bar@rev2 as the ancestor
  searching for copies back to rev 1
resolving manifests
 overwrite None partial False
 ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28
 bar: versions differ -> m
preserving bar for resolve of bar
updating: bar 1/1 files (100.00%)
picked tool 'internal:merge' for bar (binary False symlink False)
merging bar
my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
 premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% contents of bar should be line1 line2
line1
line2
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0      77      0       2 d35118874825 000000000000 000000000000
     1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
     2       153       7      2       4 ff4b45017382 d35118874825 000000000000
     3       160      13      3       5 3701b4893544 ff4b45017382 5345f5ab8abd


requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files (+1 heads)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging foo and bar to bar
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% contents of bar should be line0 line1 line2
line0
line1
line2
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0      77      0       2 d35118874825 000000000000 000000000000
     1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       7      0       0 690b295714ae 000000000000 000000000000
     1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
4:2263c1be0967 2:0f2ff26688b9 
3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9 
2:0f2ff26688b9 0:2665aaee66e9 
1:5cd961e4045d 
0:2665aaee66e9 
% this should use bar@rev2 as the ancestor
  searching for copies back to rev 1
resolving manifests
 overwrite None partial False
 ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0
 bar: versions differ -> m
preserving bar for resolve of bar
updating: bar 1/1 files (100.00%)
picked tool 'internal:merge' for bar (binary False symlink False)
merging bar
my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
 premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% contents of bar should be line1 line2
line1
line2
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0      77      0       2 d35118874825 000000000000 000000000000
     1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
     2       153       7      2       4 ff4b45017382 d35118874825 000000000000
     3       160      13      3       5 3701b4893544 ff4b45017382 5345f5ab8abd