bugmonotone - Bugs: bug #19598, 5-way merging

 
 

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

bug #19598: 5-way merging

Submitted by:  Richard Laager <rlaager>
Submitted on:  Sun 15 Apr 2007 05:19:05 PM UTC  
 
Category: NoneSeverity: 3 - Normal
Item Group: feature requestStatus: None
Privacy: PublicAssigned to: None
Open/Closed: Closed
mtn version --full: 

monotone 0.34 (base revision: unknown)
Running on : Linux 2.6.17-11-generic #2 SMP Tue Mar 13 23:32:38 UTC 2007 i686
C++ compiler : GNU C++ version 4.0.3 (Ubuntu 4.0.3-1ubuntu5)
C++ standard library: GNU libstdc++ version 20060309
Boost version : 1_33_1
Changes since base revision:
unknown

Sun 28 Oct 2007 09:59:14 PM UTC, comment #3:

It tries to use the most recent common ancestor, but it's possible to have multiple most recent common ancestors. So if that happens, it has to go back farther.

Timothy Brownawell <tbrownaw>
Project Member
Sun 28 Oct 2007 09:49:43 PM UTC, comment #2:

Is it really "a recent" or the "most recent" common ancestor? It seems like it should be the latter, but I have no idea how it is implemented.

Otherwise, thinking about this more, I can't come up with a good reason to support my position. I think you're right.

It seems I can't close this bug report for some reason.

Richard Laager <rlaager>
Sun 28 Oct 2007 09:16:38 PM UTC, comment #1:

We currently provide left, right, and a recent common ancestor. How would providing a parent of each side help with this, especially considering that there can be any number of revisions on either side since the divergence?

I suspect that the issue is actually your merge tool not making full use of the information we do provide.

Timothy Brownawell <tbrownaw>
Project Member
Sun 15 Apr 2007 05:19:05 PM UTC, original submission:

It would be extremely helpful in merging if, instead of seeing "left, merged, right", one could see "left's immediate ancestor, left, merged, right, right's immediate ancestor". In this way, one could see the actual changes that conflicted.

Richard Laager <rlaager>

 

No files currently attached

 

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 rlaager (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):

     

     

    Follows 1 latest change.

    Date Changed By Updated Field Previous Value => Replaced By
    Sun 28 Oct 2007 09:59:14 PM UTCtbrownawOpen/ClosedOpen=>Closed

    Back to the top


    Powered by Savane 3.1-cleanup1