bugmonotone - 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: 

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'.

Stephen Leake <stephen_leake>
Group Member
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>
Group administrator
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>
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 stephen_leake (Posted a comment)
  • -email is unavailable- added by tommyd (Posted a comment)
  •  

    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 StatusInvalid None
        Open/ClosedDeclined Open
    2010-08-11 tommyd Open/ClosedOpen Declined
    2010-08-11 tommyd StatusNone Invalid

    Back to the top

    Powered by Savane 3.13-f8d8.
    Corresponding source code