Mon 17 Dec 2007 11:21:58 PM UTC, original submission:
BUG description:
Setting of "mtn:manual_merge" attribute to "true"
for desired files in left revision (or/and also in right revision) does NOT enforce manual merge tool instead of incorporated monotone internal algorithm for these files.
Expected: The "mtn:manual_merge=true" should enforce execution of manual merge tool instead of automatic execution of internal merge algorithm for all flagged files.
Please see attached sample DB.
Just rough and schematic structure of the DB.
o- (result of explicit_merge, manual merge
/ \ tool has NOT been enforced during merge)
/ \
(set manual_merge -o o-(set manual_merge
=true for all | | =true for all
file1, file2, | | file1, file2,
file3) | | file3)
| |
(change file1)-o o-(change file2, file3)
\ /
\ /
o-(initial rev, add file1, file2, file3)
Try to execute following commands to reproduce the bug:
1) just formal checkout of initial revision:
mtn --db=d:\mtn\manual_merge_attr_test.mtn checkout -r c964655a24a41ae783b9b97b5152ef4e83716b4b manual_merge_attr_test
2) Prepare explicit merge (all files of both revision have already set mtn:manual_merge=true). Result - no manual merge enforced:
mtn explicit_merge 584c047171b6bc0ecf2ba2641aae66197dd36c3e ac95536e3f6fec43d960ac68b45d9edb3cc65e06 manual_merge_attr_test.your_output_testing_branch
Thanks & Regards,
m3x
|