tests/test-histedit-arguments.t
changeset 27674 78d86664e3a2
parent 27629 e7ff83b2bcfe
child 27712 bb810c8b3eca
equal deleted inserted replaced
27673:d93d340dc6ee 27674:78d86664e3a2
    62   # Edit history between eb57da33312f and 08d98a8350f3
    62   # Edit history between eb57da33312f and 08d98a8350f3
    63   #
    63   #
    64   # Commits are listed from least to most recent
    64   # Commits are listed from least to most recent
    65   #
    65   #
    66   # Commands:
    66   # Commands:
       
    67   #
       
    68   #  e, edit = use commit, but stop for amending
       
    69   #  m, mess = edit commit message without changing commit content
    67   #  p, pick = use commit
    70   #  p, pick = use commit
    68   #  e, edit = use commit, but stop for amending
    71   #  d, drop = remove commit from history
    69   #  f, fold = use commit, but combine it with the one above
    72   #  f, fold = use commit, but combine it with the one above
    70   #  r, roll = like fold, but discard this commit's description
    73   #  r, roll = like fold, but discard this commit's description
    71   #  d, drop = remove commit from history
       
    72   #  m, mess = edit commit message without changing commit content
       
    73   #
    74   #
    74 
    75 
    75 Run on a revision not ancestors of the current working directory.
    76 Run on a revision not ancestors of the current working directory.
    76 --------------------------------------------------------------------
    77 --------------------------------------------------------------------
    77 
    78 
   291   # Edit history between 3d3ea1f3a10b and 3d3ea1f3a10b
   292   # Edit history between 3d3ea1f3a10b and 3d3ea1f3a10b
   292   #
   293   #
   293   # Commits are listed from least to most recent
   294   # Commits are listed from least to most recent
   294   #
   295   #
   295   # Commands:
   296   # Commands:
       
   297   #
       
   298   #  e, edit = use commit, but stop for amending
       
   299   #  m, mess = edit commit message without changing commit content
   296   #  p, pick = use commit
   300   #  p, pick = use commit
   297   #  e, edit = use commit, but stop for amending
   301   #  d, drop = remove commit from history
   298   #  f, fold = use commit, but combine it with the one above
   302   #  f, fold = use commit, but combine it with the one above
   299   #  r, roll = like fold, but discard this commit's description
   303   #  r, roll = like fold, but discard this commit's description
   300   #  d, drop = remove commit from history
       
   301   #  m, mess = edit commit message without changing commit content
       
   302   #
   304   #
   303 
   305 
   304 Test --continue with --keep
   306 Test --continue with --keep
   305 
   307 
   306   $ hg strip -q -r . --config extensions.strip=
   308   $ hg strip -q -r . --config extensions.strip=