equal
deleted
inserted
replaced
184 |/ |
184 |/ |
185 o 5:66719795a494@default(public) bk:[changea] changea |
185 o 5:66719795a494@default(public) bk:[changea] changea |
186 | |
186 | |
187 o 0:07f494440405@default(public) bk:[] adda |
187 o 0:07f494440405@default(public) bk:[] adda |
188 |
188 |
|
189 XXX: c addition should not be part of this patch |
|
190 $ hg exp |
|
191 # HG changeset patch |
|
192 # User test |
|
193 # Date 0 0 |
|
194 # Thu Jan 01 00:00:00 1970 +0000 |
|
195 # Node ID 3d968e0b3097ef69b104ff2e1af43fce665feb0a |
|
196 # Parent 1cf0aacfd36310b18e403e1594871187e0364a82 |
|
197 phase-divergent update to 1cf0aacfd363: |
|
198 |
|
199 newer a |
|
200 |
|
201 diff -r 1cf0aacfd363 -r 3d968e0b3097 a |
|
202 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
203 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
204 @@ -1,3 +1,4 @@ |
|
205 a |
|
206 a |
|
207 newer a |
|
208 +babar |
|
209 diff -r 1cf0aacfd363 -r 3d968e0b3097 c |
|
210 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
211 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
212 @@ -0,0 +1,1 @@ |
|
213 +c |
189 |
214 |
190 Stabilize divergent changesets with same parent |
215 Stabilize divergent changesets with same parent |
191 =============================================== |
216 =============================================== |
192 |
217 |
193 $ rm a.orig |
218 $ rm a.orig |