bugmonotone - Bugs: bug #8549, handle tree-layout merge failure...

 
 

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

bug #8549: handle tree-layout merge failure sensibly

Submitted by:  graydon hoare <graydon>
Submitted on:  Tue 13 Apr 2004 06:20:21 AM UTC  
 
Category: merge algorithmSeverity: 3 - Normal
Item Group: feature requestStatus: Fixed
Privacy: PublicAssigned to: Stephen Leake <stephen_leake>
Open/Closed: Closed
mtn version --full: 

Sun 09 May 2010 10:26:59 AM UTC, comment #3:

This is solved by the 'mtn conflict' set of commands.

Stephen Leake <stephen_leake>
Project MemberIn charge of this item.
Sat 08 May 2010 08:56:22 PM UTC, comment #2:

This would be for example merge("rename a to b", "rename a to c") or merge("rename x to z", "rename y to z") and the like. Anything that causes a merge conflict when mark-merging the parent or name of a node_t.

Timothy Brownawell <tbrownaw>
Project Member
Sat 08 May 2010 07:22:13 PM UTC, comment #1:

need an example; what is an "unresolvable tree layout change"?

Stephen Leake <stephen_leake>
Project MemberIn charge of this item.
Tue 13 Apr 2004 06:20:21 AM UTC, original submission:

punt a work description to a user merger when there's unresolvable tree layout changes

graydon hoare <graydon>
Project Member

 

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 stephen_leake (Posted a comment)
  • -unavailable- added by tommyd (Updated 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
    Mon 10 May 2010 11:09:19 AM UTCstephen_leakeOpen/ClosedIn Test=>Closed
    Sun 09 May 2010 09:39:33 PM UTCtommydAssigned toNone=>stephen_leake
    Sun 09 May 2010 10:26:59 AM UTCstephen_leakeStatusNone=>Fixed
      Open/ClosedOpen=>In Test
    Fri 30 Apr 2010 11:25:39 AM UTCtommydAssigned tograydon=>None

    Back to the top


    Powered by Savane 3.1-cleanup1