monotone - 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: |
Stephen Leake <stephen_leake> |
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> |
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> |
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> |
No files currently attached
Depends on the following items: None found
Items that depend on this one: None found
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/Closed | In Test | Closed | |
2010-05-09 | tommyd | Assigned to | None | stephen_leake | |
2010-05-09 | stephen_leake | Status | None | Fixed | |
Open/Closed | Open | In Test | |||
2010-04-30 | tommyd | Assigned to | graydon | None |
Powered by Savane 3.13-0329.
Corresponding source code
This is solved by the 'mtn conflict' set of commands.