monotone - 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 |
Item Group: | documentation issue | Status: | None |
Privacy: | Public | Assigned to: | None |
Open/Closed: | Open | ||
mtn version --full: |
Spam posted by anonymous | |
Fri 21 Jul 2006 02:26:42 AM UTC, comment #2: |
Thomas Keller <tommyd> |
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.
|
Erik MT <codehappy> |
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.
|
Erik MT <codehappy> |
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.
Powered by Savane 3.13-02a9.
Corresponding source code
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.