bugmonotone - Bugs: bug #5685, "explain merge",...

 
 

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

bug #5685: "explain merge", "explain update"

Submitted by:  graydon hoare <graydon>
Submitted on:  Wed 01 Oct 2003 10:40:33 PM UTC  
 
Category: command line UISeverity: 2 - Minor
Item Group: feature requestStatus: None
Privacy: PublicAssigned 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>
Project 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>
Project 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>
Project Member

 

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by stephen_leake (Posted a comment)
  • -unavailable- added by tommyd (Posted a comment)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 4 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Sat 14 Aug 2010 06:39:22 AM UTCstephen_leakeStatusInvalid=>None
      Open/ClosedDeclined=>Open
    Wed 11 Aug 2010 02:00:25 PM UTCtommydOpen/ClosedOpen=>Declined
    Wed 11 Aug 2010 02:00:24 PM UTCtommydStatusNone=>Invalid

    Back to the top


    Powered by Savane 3.1-cleanup