bugmonotone - Bugs: bug #21821, mtn:manual_merge issue

 
 

You are not allowed to post comments on this tracker with your current authentication level.

bug #21821: mtn:manual_merge issue

Submitted by:  matrixcruiser <matrixcruiser>
Submitted on:  Mon 17 Dec 2007 11:21:58 PM UTC  
 
Category: merge algorithmSeverity: 3 - Normal
Item Group: incorrect behaviorStatus: Invalid
Privacy: PublicAssigned to: Erik MT <codehappy>
Open/Closed: Closed
mtn version --full: 

monotone 0.38 (base revision: c1757f6cde49bddd77c82580059105bc470145b2)
windows native build

Mon 13 Oct 2008 10:44:30 PM UTC, comment #2:

It doesn't run any content merger, internal or external, on those files. This is because it sees that only one line of development actually changed the file, so there's nothing for the merger to do.

Timothy Brownawell <tbrownaw>
Project Member
Mon 17 Dec 2007 11:28:11 PM UTC, comment #1:

Original description message has been reformatted during submit, so text DB graph structure is not readable. Please see attached text file to see it.
Regards,
m3x

(file #14649)

matrixcruiser <matrixcruiser>
Project Member
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

matrixcruiser <matrixcruiser>
Project Member

 

Attached Files
file #14648:  manual_merge_attr_test.mtn added by matrixcruiser (312KiB - application/octet-stream)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by tbrownaw (Posted a comment)
  • -unavailable- added by matrixcruiser (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 5 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Wed 25 Feb 2009 05:23:17 AM UTCtbrownawStatusNone=>Invalid
      Open/ClosedOpen=>Closed
    Thu 29 May 2008 05:31:28 AM UTCmatrixcruiserAssigned toNone=>codehappy
    Mon 17 Dec 2007 11:28:11 PM UTCmatrixcruiserAttached File-=>Added manual_merge_attr__DB_version_tree.txt, #14649
    Mon 17 Dec 2007 11:21:58 PM UTCmatrixcruiserAttached File-=>Added manual_merge_attr_test.mtn, #14648

    Back to the top


    Powered by Savane 3.1-cleanup1