tests/test-histedit-outgoing.out
changeset 17085 35729bdd59b6
parent 17084 69dae7982c85
child 17086 5f2cacb715dc
equal deleted inserted replaced
17084:69dae7982c85 17085:35729bdd59b6
     1 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
     2 % show the edit commands offered by outgoing
       
     3 pick 055a42cdd887 3 d
       
     4 pick e860deea161a 4 e
       
     5 pick 652413bf663e 5 f
       
     6 
       
     7 # Edit history between 055a42cdd887 and 652413bf663e
       
     8 #
       
     9 # Commands:
       
    10 #  p, pick = use commit
       
    11 #  e, edit = use commit, but stop for amending
       
    12 #  f, fold = use commit, but fold into previous commit (combines N and N-1)
       
    13 #  d, drop = remove commit from history
       
    14 #  m, mess = edit message without changing commit content
       
    15 #
       
    16 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    17 % show the error from unrelated repos
       
    18 abort: repository is unrelated
       
    19 % show the error from unrelated repos
       
    20 comparing with ../r
       
    21 searching for changes
       
    22 warning: repository is unrelated
       
    23 pick 2a4042b45417 0 g
       
    24 pick 68c46b4927ce 1 h
       
    25 pick 51281e65ba79 2 i
       
    26 
       
    27 # Edit history between 2a4042b45417 and 51281e65ba79
       
    28 #
       
    29 # Commands:
       
    30 #  p, pick = use commit
       
    31 #  e, edit = use commit, but stop for amending
       
    32 #  f, fold = use commit, but fold into previous commit (combines N and N-1)
       
    33 #  d, drop = remove commit from history
       
    34 #  m, mess = edit message without changing commit content
       
    35 #
       
    36 0 files updated, 0 files merged, 0 files removed, 0 files unresolved