44 # Edit history between 055a42cdd887 and 652413bf663e |
44 # Edit history between 055a42cdd887 and 652413bf663e |
45 # |
45 # |
46 # Commits are listed from least to most recent |
46 # Commits are listed from least to most recent |
47 # |
47 # |
48 # Commands: |
48 # Commands: |
|
49 # |
|
50 # e, edit = use commit, but stop for amending |
|
51 # m, mess = edit commit message without changing commit content |
49 # p, pick = use commit |
52 # p, pick = use commit |
50 # e, edit = use commit, but stop for amending |
53 # d, drop = remove commit from history |
51 # f, fold = use commit, but combine it with the one above |
54 # f, fold = use commit, but combine it with the one above |
52 # r, roll = like fold, but discard this commit's description |
55 # r, roll = like fold, but discard this commit's description |
53 # d, drop = remove commit from history |
|
54 # m, mess = edit commit message without changing commit content |
|
55 # |
56 # |
56 $ cd .. |
57 $ cd .. |
57 |
58 |
58 show the error from unrelated repos |
59 show the error from unrelated repos |
59 $ cd r3 |
60 $ cd r3 |
75 # Edit history between 2a4042b45417 and 51281e65ba79 |
76 # Edit history between 2a4042b45417 and 51281e65ba79 |
76 # |
77 # |
77 # Commits are listed from least to most recent |
78 # Commits are listed from least to most recent |
78 # |
79 # |
79 # Commands: |
80 # Commands: |
|
81 # |
|
82 # e, edit = use commit, but stop for amending |
|
83 # m, mess = edit commit message without changing commit content |
80 # p, pick = use commit |
84 # p, pick = use commit |
81 # e, edit = use commit, but stop for amending |
85 # d, drop = remove commit from history |
82 # f, fold = use commit, but combine it with the one above |
86 # f, fold = use commit, but combine it with the one above |
83 # r, roll = like fold, but discard this commit's description |
87 # r, roll = like fold, but discard this commit's description |
84 # d, drop = remove commit from history |
|
85 # m, mess = edit commit message without changing commit content |
|
86 # |
88 # |
87 $ cd .. |
89 $ cd .. |
88 |
90 |
89 test sensitivity to branch in URL: |
91 test sensitivity to branch in URL: |
90 |
92 |
98 # Edit history between f26599ee3441 and f26599ee3441 |
100 # Edit history between f26599ee3441 and f26599ee3441 |
99 # |
101 # |
100 # Commits are listed from least to most recent |
102 # Commits are listed from least to most recent |
101 # |
103 # |
102 # Commands: |
104 # Commands: |
|
105 # |
|
106 # e, edit = use commit, but stop for amending |
|
107 # m, mess = edit commit message without changing commit content |
103 # p, pick = use commit |
108 # p, pick = use commit |
104 # e, edit = use commit, but stop for amending |
109 # d, drop = remove commit from history |
105 # f, fold = use commit, but combine it with the one above |
110 # f, fold = use commit, but combine it with the one above |
106 # r, roll = like fold, but discard this commit's description |
111 # r, roll = like fold, but discard this commit's description |
107 # d, drop = remove commit from history |
|
108 # m, mess = edit commit message without changing commit content |
|
109 # |
112 # |
110 |
113 |
111 test to check number of roots in outgoing revisions |
114 test to check number of roots in outgoing revisions |
112 |
115 |
113 $ hg -q outgoing -G --template '{node|short}({branch})' '../r' |
116 $ hg -q outgoing -G --template '{node|short}({branch})' '../r' |