monotone - Bugs: bug #5685, "explain merge",...
You are not allowed to post comments on this tracker with your current authentication level.
bug #5685: "explain merge", "explain update"
Submitter: | graydon hoare <graydon> | ||
Submitted: | Wed 01 Oct 2003 10:40:33 PM UTC | ||
Category: | command line UI | Severity: | 2 - Minor |
Item Group: | feature request | Status: | None |
Privacy: | Public | Assigned to: | None |
Open/Closed: | Open | ||
mtn version --full: |
|
Sat 14 Aug 2010 06:39:22 AM UTC, comment #3: |
Stephen Leake <stephen_leake> |
Wed 11 Aug 2010 02:00:25 PM UTC, comment #2: We have a pretty good command help system by now, so "mtn help command" should really be enough. |
Thomas Keller <tommyd> |
Sun 06 Jun 2004 11:19:51 PM UTC, comment #1: I'd like to put in my vote for these -- more generally, a query but don't act mode for any command. |
Eric Meyer <eemeyer> |
Wed 01 Oct 2003 10:40:33 PM UTC, original submission:
variants on explain which give you a detailed description of what monotone would do if you issued that command (update, merge). |
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 4 latest changes.
Date | Changed by | Updated Field | Previous Value | => | Replaced by |
---|---|---|---|---|---|
2010-08-14 | stephen_leake | Status | Invalid | None | |
Open/Closed | Declined | Open | |||
2010-08-11 | tommyd | Open/Closed | Open | Declined | |
2010-08-11 | tommyd | Status | None | Invalid |
Powered by Savane 3.13-caa5.
Corresponding source code
I think this bug is about adding a preview option to merge:
merge --preview
would generate the final revision description (change list), but not actually do the merge. The point is to understand what the final revision would look like, what files would change or be added.
This is similar to --dry-run in Gnu make.
'mtn show_conflicts' does part of this; it shows all files that change relative to both parents. Files that don't have conflicts don't change.
To show "files that are in one parent but not the other", we could add an option '--include-add_drop' to 'show_conflict' to include those as 'add' or 'drop' conflicts; the conflict resolution would be 'keep' or 'drop'.