1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
|
=============================================================
Testing comparing changeset regardless of change from parents
=============================================================
Setup
=====
Add a bunch of changes some related to each other some not.
$ hg init test-repo
$ cd test-repo
$ cat << EOF > file-a.txt
> one
> two
> three
> four
> five
> six
> seven
> eight
> nine
> ten
> EOF
$ hg add file-a.txt
$ hg commit -m 'commit_root'
$ sed s/two/deux/ file-a.txt > a
$ mv a file-a.txt
$ hg commit -m 'commit_A1_change'
$ sed s/five/cinq/ file-a.txt > a
$ mv a file-a.txt
$ hg commit -m 'commit_A2_change'
$ cat << EOF > file-b.txt
> egg
> salade
> orange
> EOF
$ hg add file-b.txt
$ hg commit -m 'commit_A3_change'
$ cat << EOF > file-b.txt
> butter
> egg
> salade
> orange
> EOF
$ hg commit -m 'commit_A4_change'
$ hg up 'desc("commit_root")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ sed s/two/deux/ file-a.txt > a
$ mv a file-a.txt
$ sed s/ten/dix/ file-a.txt > a
$ mv a file-a.txt
$ hg commit -m 'commit_B1_change'
created new head
$ sed s/five/funf/ file-a.txt > a
$ mv a file-a.txt
$ sed s/eight/acht/ file-a.txt > a
$ mv a file-a.txt
$ hg commit -m 'commit_B2_change'
$ cat << EOF > file-b.txt
> milk
> egg
> salade
> apple
> EOF
$ hg add file-b.txt
$ hg commit -m 'commit_B3_change'
$ cat << EOF > file-b.txt
> butter
> milk
> egg
> salade
> apple
> EOF
$ hg commit -m 'commit_B4_change'
$ hg log -G --patch
@ changeset: 8:0d6b02d59faf
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: commit_B4_change
|
| diff -r 59c9679fd24c -r 0d6b02d59faf file-b.txt
| --- a/file-b.txt Thu Jan 01 00:00:00 1970 +0000
| +++ b/file-b.txt Thu Jan 01 00:00:00 1970 +0000
| @@ -1,3 +1,4 @@
| +butter
| milk
| egg
| salade
|
o changeset: 7:59c9679fd24c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: commit_B3_change
|
| diff -r 1e73118ddc3a -r 59c9679fd24c file-b.txt
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
| +++ b/file-b.txt Thu Jan 01 00:00:00 1970 +0000
| @@ -0,0 +1,4 @@
| +milk
| +egg
| +salade
| +apple
|
o changeset: 6:1e73118ddc3a
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: commit_B2_change
|
| diff -r 30a40f18d81e -r 1e73118ddc3a file-a.txt
| --- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
| +++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
| @@ -2,9 +2,9 @@
| deux
| three
| four
| -five
| +funf
| six
| seven
| -eight
| +acht
| nine
| dix
|
o changeset: 5:30a40f18d81e
| parent: 0:9c17110ca844
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: commit_B1_change
|
| diff -r 9c17110ca844 -r 30a40f18d81e file-a.txt
| --- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
| +++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
| @@ -1,5 +1,5 @@
| one
| -two
| +deux
| three
| four
| five
| @@ -7,4 +7,4 @@
| seven
| eight
| nine
| -ten
| +dix
|
| o changeset: 4:e6f5655bdf2e
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: commit_A4_change
| |
| | diff -r 074ad64f5cd7 -r e6f5655bdf2e file-b.txt
| | --- a/file-b.txt Thu Jan 01 00:00:00 1970 +0000
| | +++ b/file-b.txt Thu Jan 01 00:00:00 1970 +0000
| | @@ -1,3 +1,4 @@
| | +butter
| | egg
| | salade
| | orange
| |
| o changeset: 3:074ad64f5cd7
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: commit_A3_change
| |
| | diff -r 37c330f02452 -r 074ad64f5cd7 file-b.txt
| | --- /dev/null Thu Jan 01 00:00:00 1970 +0000
| | +++ b/file-b.txt Thu Jan 01 00:00:00 1970 +0000
| | @@ -0,0 +1,3 @@
| | +egg
| | +salade
| | +orange
| |
| o changeset: 2:37c330f02452
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: commit_A2_change
| |
| | diff -r 7bcbc987bcfe -r 37c330f02452 file-a.txt
| | --- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
| | +++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
| | @@ -2,7 +2,7 @@
| | deux
| | three
| | four
| | -five
| | +cinq
| | six
| | seven
| | eight
| |
| o changeset: 1:7bcbc987bcfe
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: commit_A1_change
|
| diff -r 9c17110ca844 -r 7bcbc987bcfe file-a.txt
| --- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
| +++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
| @@ -1,5 +1,5 @@
| one
| -two
| +deux
| three
| four
| five
|
o changeset: 0:9c17110ca844
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit_root
diff -r 000000000000 -r 9c17110ca844 file-a.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,10 @@
+one
+two
+three
+four
+five
+six
+seven
+eight
+nine
+ten
Then compare the resulting revisions:
====================================
A1 and B1 has the same parent, so the same output is expected.
$ hg diff --from 'desc("commit_A1_change")' --to 'desc("commit_B1_change")'
diff -r 7bcbc987bcfe -r 30a40f18d81e file-a.txt
--- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -7,4 +7,4 @@
seven
eight
nine
-ten
+dix
$ hg diff --from 'desc("commit_A1_change")' --to 'desc("commit_B1_change")' --ignore-changes-from-ancestors
diff -r 7bcbc987bcfe -r 30a40f18d81e file-a.txt
--- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -7,4 +7,4 @@
seven
eight
nine
-ten
+dix
Skipping B1 change mean the final "ten" change is no longer part of the diff
$ hg diff --from 'desc("commit_A1_change")' --to 'desc("commit_B2_change")'
diff -r 7bcbc987bcfe -r 1e73118ddc3a file-a.txt
--- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -2,9 +2,9 @@
deux
three
four
-five
+funf
six
seven
-eight
+acht
nine
-ten
+dix
$ hg diff --from 'desc("commit_A1_change")' --to 'desc("commit_B2_change")' --ignore-changes-from-ancestors
diff -r 1e73118ddc3a file-a.txt
--- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -2,9 +2,9 @@
deux
three
four
-five
+funf
six
seven
-eight
+acht
nine
dix
Skipping A1 changes means the "two" changes introduced by "B1" (but also
present in A2 parent, A1) is back on the table.
$ hg diff --from 'desc("commit_A2_change")' --to 'desc("commit_B1_change")'
diff -r 37c330f02452 -r 30a40f18d81e file-a.txt
--- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -2,9 +2,9 @@
deux
three
four
-cinq
+five
six
seven
eight
nine
-ten
+dix
$ hg diff --from 'desc("commit_A2_change")' --to 'desc("commit_B1_change")' --ignore-changes-from-ancestors
diff -r 30a40f18d81e file-a.txt
--- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +1,10 @@
one
-two
+deux
three
four
-cinq
+five
six
seven
eight
nine
-ten
+dix
All changes from A1 and B1 are no longer in the picture as we compare A2 and B2
$ hg diff --from 'desc("commit_A2_change")' --to 'desc("commit_B2_change")'
diff -r 37c330f02452 -r 1e73118ddc3a file-a.txt
--- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -2,9 +2,9 @@
deux
three
four
-cinq
+funf
six
seven
-eight
+acht
nine
-ten
+dix
$ hg diff --from 'desc("commit_A2_change")' --to 'desc("commit_B2_change")' --ignore-changes-from-ancestors
diff -r 1e73118ddc3a file-a.txt
--- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -2,9 +2,9 @@
deux
three
four
-cinq
+funf
six
seven
-eight
+acht
nine
dix
Similar patches
---------------
comparing A3 and B3 patches is much more terse. focusing on the change to the
two similar patches, ignoring the rests of the changes (like comparing apples
and oranges)
$ hg diff --from 'desc("commit_A3_change")' --to 'desc("commit_B3_change")'
diff -r 074ad64f5cd7 -r 59c9679fd24c file-a.txt
--- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -2,9 +2,9 @@
deux
three
four
-cinq
+funf
six
seven
-eight
+acht
nine
-ten
+dix
diff -r 074ad64f5cd7 -r 59c9679fd24c file-b.txt
--- a/file-b.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-b.txt Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +1,4 @@
+milk
egg
salade
-orange
+apple
$ hg diff --from 'desc("commit_A3_change")' --to 'desc("commit_B3_change")' --ignore-changes-from-ancestors
diff -r 59c9679fd24c file-b.txt
--- a/file-b.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-b.txt Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +1,4 @@
+milk
egg
salade
-orange
+apple
Conflict handling
-----------------
Conflict should not be a big deal and its resolution should be presented to the user.
$ hg diff --from 'desc("commit_A4_change")' --to 'desc("commit_B4_change")'
diff -r e6f5655bdf2e -r 0d6b02d59faf file-a.txt
--- a/file-a.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-a.txt Thu Jan 01 00:00:00 1970 +0000
@@ -2,9 +2,9 @@
deux
three
four
-cinq
+funf
six
seven
-eight
+acht
nine
-ten
+dix
diff -r e6f5655bdf2e -r 0d6b02d59faf file-b.txt
--- a/file-b.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-b.txt Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +1,5 @@
butter
+milk
egg
salade
-orange
+apple
$ hg diff --from 'desc("commit_A4_change")' --to 'desc("commit_B4_change")' --ignore-changes-from-ancestors
diff -r 0d6b02d59faf file-b.txt
--- a/file-b.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file-b.txt Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +1,5 @@
-<<<<<<< from: e6f5655bdf2e - test: commit_A4_change
butter
-||||||| parent-of-from: 074ad64f5cd7 - test: commit_A3_change
-=======
milk
->>>>>>> parent-of-to: 59c9679fd24c - test: commit_B3_change
egg
salade
apple
|
