Changes between Version 28 and Version 29 of DarcsEvaluation


Ignore:
Timestamp:
Jul 24, 2008 1:56:23 PM (6 years ago)
Author:
batterseapower
Comment:

Tweak Mercurial output

Legend:

Unmodified
Added
Removed
Modified
  • DarcsEvaluation

    v28 v29  
    142142 
    143143cd ../repo2 
    144 # Don't know how to do this: darcs pull --all --patches patch3 
     144(cd ../repo1; hg log | grep patch3 -4) # note the changeset number of patch3, should be 2 
     145hg transplant --source ../repo1 2 
    145146cd ../repo3 
    146147hg transplant --source ../repo1 
    147148# It doesn't appear to be possible to omit the source argument for transplant, 
    148149# though you can omit it from the non-cherrypicking hg pull 
    149 n 
    150 y 
     150n <press enter> 
     151y <press enter> 
    151152 
    152153# repo2's and repo3's file now contains lines 1,3,4,5,7 
     
    227228 
    228229hg record -m the_fix 
    229 # Annoyingly you have to press enter after each of these characters. Darcs does not require this. 
    230 # Perhaps it's configurable? 
    231 Y 
    232 y 
    233 n 
    234 y 
    235 n 
     230Y <press enter> 
     231y <press enter> 
     232n <press enter> 
     233y <press enter> 
     234n <press enter> 
    236235 
    237236# Get rid of the debug prints 
     
    248247The same is available for Git.  The command is called {{{git commit --amend}}}.  You usually checkout the commit you want to edit into a branch, do the changes, then rebase the remaining patches on top of this.  Example coming soon... 
    249248 
    250 I can't find a way to do this directly with Mercurial. You can of course do {{{hg rollback}}} and then add a new commit, however. 
     249I can't find a way to do this directly with Mercurial. You can of course do {{{hg rollback}}} and then add a new commit. The Mercurial Queues extension is also able to do this (hg qrefresh) but it is rather complicated to use. 
    251250 
    252251=== Darcs vs Mercurial Overview ===