bugmonotone - Bugs: bug #21569, 3 way merge by kdiff3

 
 

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

bug #21569: 3 way merge by kdiff3

Submitted by:  Gabor Opposits <ogabor>
Submitted on:  Tue 13 Nov 2007 12:53:25 PM UTC  
 
Category: merge algorithmSeverity: 3 - Normal
Item Group: incorrect behaviorStatus: None
Privacy: PublicAssigned to: None
Open/Closed: Open
mtn version --full: 

monotone 0.30 (base revision: unknown)
under win32

 Spam posted by an anonymous
Wed 14 Nov 2007 10:44:49 AM UTC, comment #1:

The left pane ("A") contains the ancestor. My kdiff3 displays "(Base)" next to the filename for file "A" in order to remind me on that.

There's currently no indication to which revisions file versions "B" and "C" belong. We might want to improve that. However, it is not clear what the most important information to display would be: revision_id? date? author? , because the available space is limited.

If you want to see how kdiff3 is called, have a look at the mergers.kdiff3 function in std_hooks.lua. Using custom lua code in your monotonerc, you can override the standard behavior.

Thomas Moschny <moschny>
Project Administrator
Tue 13 Nov 2007 12:53:25 PM UTC, original submission:

opgabor@petrence:/c/temp/vpp$ mtn merge
mtn: 2 heads on branch 'hu.dote.pet.vpp'
mtn: [left] b6e90d8306a670f8035a1728f2c1830088822f32
mtn: [right] baa3c6ca3f3f3a15f04122a61629648b435d30b5
mtn: help required for 3-way merge
mtn: [ancestor] tests/tFileIo.cc
mtn: [ left] tests/tFileIo.cc
mtn: [ right] tests/tFileIo.cc
mtn: [ merged] tests/tFileIo.cc
executing external 3-way merge command

and the emerged Kdiff3 contains 3 panes side by side in this order:
left : ancestor (43bba36ee65d343fbaf2adabfdfde90ea1984e16),
middle: b6e90d8306a670f8035a1728f2c1830088822f32,
right : baa3c6ca3f3f3a15f04122a61629648b435d30b5.
I could determine the revisions by contents of each pane.

I thought the middle pane contains the ancestor. Is it right? How can I find out which revision belongs to each panes easily?

Gabor Opposits <ogabor>

 

Attached Files
file #14375:  mtn.JPG added by ogabor (39kB - image/jpeg)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by moschny (Posted a comment)
  • -unavailable- added by ogabor (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
    Tue 13 Nov 2007 12:53:25 PM UTCogaborAttached File-=>Added mtn.JPG, #14375

    Back to the top


    Powered by Savane 3.1-cleanup