bugmonotone - Bugs: bug #17159, doc: clarification needed - action...

 
 

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

bug #17159: doc: clarification needed - action of manual merge on abort

Submitter:  Erik MT <codehappy>
Submitted:  Thu 20 Jul 2006 04:05:59 AM UTC
   
 
Category:  None Severity:  3 - Normal
Priority:  5 - Normal Item Group:  documentation issue
Status:  None Privacy:  Public
Assigned to:  None Open/Closed:  Open
mtn version --full: 

http://www.venge. ... docs/Merging.html

Discussion

  Spam posted by anonymous
Fri 21 Jul 2006 02:26:42 AM UTC, comment #2: 

monotone does its merge in database, rather than in workspace (there are efforts to implement a merge-in-workspace, however), so if the merge is aborted at any time monotone exactly does what the docs state, it reverts all changes made by the merge so far. This can be unwanted if you already merged 30 files and on the 31st file your merge tool crashes, thats one reason for merge-in-workspace amongst others.

Thomas Keller <tommyd>
Group administrator
Thu 20 Jul 2006 04:11:46 AM UTC, comment #1: 

quote: By redefining the aforementioned hooks the user can not only choose a preferred merge tool, but even select different programs for different file types.


I've read the "hook" docs.   it wasn't clear to me how you would configure it to "select different programs for different file types."   an example would be nice.



Erik MT <codehappy>
Group Member
Thu 20 Jul 2006 04:05:59 AM UTC, original submission:  

quote: If the tool terminates without writing the merged file, monotone aborts the merging, reverting any changes made.


It is not clear from this description, what exactly happens to the local file.  My understanding of "revert" is that it tosses local changes and replaces the file from a version.

I saw a comment in email about a potential data loss; this needs to be clearly documented as to what exactly happens on abort and how to recover from it.

Erik MT <codehappy>
Group Member

 

Attached Files

This item currently has no attached files.

 

Dependencies

This item does not depend on any other items.

No items depend on this one.

 

Mail Notification Carbon-Copy List

 

Votes

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.

 

History

No changes have been made to this item

Back to the top

Powered by Savane 3.16-598c.
Corresponding source code