equal
deleted
inserted
replaced
150 @ a94e0fd5f1c8 (18) F1 |
150 @ a94e0fd5f1c8 (18) F1 |
151 | |
151 | |
152 x fad47e5bd78e (16) F0 |
152 x fad47e5bd78e (16) F0 |
153 rewritten(description, user, date, branch) by test (*) as a94e0fd5f1c8 (glob) |
153 rewritten(description, user, date, branch) by test (*) as a94e0fd5f1c8 (glob) |
154 |
154 |
|
155 rebase not touching the diff |
|
156 ---------------------------- |
|
157 |
|
158 $ cat << EOF > H0 |
|
159 > 0 |
|
160 > 1 |
|
161 > 2 |
|
162 > 3 |
|
163 > 4 |
|
164 > 5 |
|
165 > 6 |
|
166 > 7 |
|
167 > 8 |
|
168 > 9 |
|
169 > 10 |
|
170 > EOF |
|
171 $ hg add H0 |
|
172 $ hg commit -m 'H0' |
|
173 $ echo "H1" >> H0 |
|
174 $ hg commit -m "H1" |
|
175 $ hg up -r "desc(H0)" |
|
176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
177 $ cat << EOF > H0 |
|
178 > H2 |
|
179 > 0 |
|
180 > 1 |
|
181 > 2 |
|
182 > 3 |
|
183 > 4 |
|
184 > 5 |
|
185 > 6 |
|
186 > 7 |
|
187 > 8 |
|
188 > 9 |
|
189 > 10 |
|
190 > EOF |
|
191 $ hg commit -m "H2" |
|
192 created new head |
|
193 $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3 |
|
194 rebasing 20:b57fed8d8322 "H1" |
|
195 merging H0 |
|
196 $ hg obslog tip |
|
197 o e509e2eb3df5 (22) H1 |
|
198 | |
|
199 x b57fed8d8322 (20) H1 |
|
200 rewritten(parent, content) by test (*) as e509e2eb3df5 (glob) |
|
201 |