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

Submitter:  graydon hoare <graydon>
Submitted:  Tue 13 Apr 2004 06:20:21 AM UTC
   
 
Category:  merge algorithm Severity:  3 - Normal
Item Group:  feature request Status:  Fixed
Privacy:  Public Assigned to:  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>
Group Member
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>
Group 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>
Group Member
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>
Group Member

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -email is unavailable- added by tbrownaw (Posted a comment)
  • -email is unavailable- added by stephen_leake (Posted a comment)
  • -email is unavailable- added by tommyd (Updated the item)
  •  

    There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

     

    Follow 5 latest changes.

    Date Changed by Updated Field Previous Value => Replaced by
    2010-05-10 stephen_leake Open/ClosedIn Test Closed
    2010-05-09 tommyd Assigned toNone stephen_leake
    2010-05-09 stephen_leake StatusNone Fixed
        Open/ClosedOpen In Test
    2010-04-30 tommyd Assigned tograydon None

    Back to the top

    Powered by Savane 3.13-0329.
    Corresponding source code