]> git.ipfire.org Git - thirdparty/git.git/blame - t/t3206/history.export
Merge branch 'en/merge-recursive-directory-rename-fixes'
[thirdparty/git.git] / t / t3206 / history.export
CommitLineData
8884cf15
TR
1blob
2mark :1
3data 51
41
52
63
74
85
96
107
118
129
1310
1411
1512
1613
1714
1815
1916
2017
2118
2219
2320
24
b66885a3
TG
25reset refs/heads/renamed-file
26commit refs/heads/renamed-file
8884cf15
TR
27mark :2
28author Thomas Rast <trast@inf.ethz.ch> 1374424921 +0200
29committer Thomas Rast <trast@inf.ethz.ch> 1374484724 +0200
30data 8
31initial
32M 100644 :1 file
33
34blob
35mark :3
36data 51
371
382
393
404
41A
426
437
448
459
4610
4711
4812
4913
5014
5115
5216
5317
5418
5519
5620
57
2b6a9b13 58commit refs/heads/mode-only-change
8884cf15
TR
59mark :4
60author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
61committer Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
62data 7
63s/5/A/
64from :2
65M 100644 :3 file
66
67blob
68mark :5
69data 51
701
712
723
73A
74A
756
767
778
789
7910
8011
8112
8213
8314
8415
8516
8617
8718
8819
8920
90
91commit refs/heads/topic
92mark :6
93author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
94committer Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
95data 7
96s/4/A/
97from :4
98M 100644 :5 file
99
100blob
101mark :7
102data 50
1031
1042
1053
106A
107A
1086
1097
1108
1119
11210
113B
11412
11513
11614
11715
11816
11917
12018
12119
12220
123
124commit refs/heads/topic
125mark :8
126author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
127committer Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
128data 8
129s/11/B/
130from :6
131M 100644 :7 file
132
133blob
134mark :9
135data 49
1361
1372
1383
139A
140A
1416
1427
1438
1449
14510
146B
147B
14813
14914
15015
15116
15217
15318
15419
15520
156
157commit refs/heads/topic
158mark :10
159author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
160committer Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
161data 8
162s/12/B/
163from :8
164M 100644 :9 file
165
166blob
167mark :11
168data 10
169unrelated
170
171commit refs/heads/master
172mark :12
173author Thomas Rast <trast@inf.ethz.ch> 1374485127 +0200
174committer Thomas Rast <trast@inf.ethz.ch> 1374485127 +0200
175data 10
176unrelated
177from :2
178M 100644 :11 otherfile
179
180commit refs/heads/rebased
181mark :13
182author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
183committer Thomas Rast <trast@inf.ethz.ch> 1374485137 +0200
184data 7
185s/5/A/
186from :12
187M 100644 :3 file
188
189commit refs/heads/rebased
190mark :14
191author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
192committer Thomas Rast <trast@inf.ethz.ch> 1374485138 +0200
193data 7
194s/4/A/
195from :13
196M 100644 :5 file
197
198commit refs/heads/rebased
199mark :15
200author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
201committer Thomas Rast <trast@inf.ethz.ch> 1374485138 +0200
202data 8
203s/11/B/
204from :14
205M 100644 :7 file
206
207commit refs/heads/rebased
208mark :16
209author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
210committer Thomas Rast <trast@inf.ethz.ch> 1374485138 +0200
211data 8
212s/12/B/
213from :15
214M 100644 :9 file
215
216commit refs/heads/added
217mark :17
218author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
219committer Thomas Rast <trast@inf.ethz.ch> 1374485341 +0200
220data 7
221s/5/A/
222from :2
223M 100644 :3 file
224
225commit refs/heads/added
226mark :18
227author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
228committer Thomas Rast <trast@inf.ethz.ch> 1374485341 +0200
229data 7
230s/4/A/
231from :17
232M 100644 :5 file
233
234blob
235mark :19
236data 51
2371
2382
2393
240A
241A
242A
2437
2448
2459
24610
24711
24812
24913
25014
25115
25216
25317
25418
25519
25620
257
258commit refs/heads/added
259mark :20
260author Thomas Rast <trast@inf.ethz.ch> 1374485186 +0200
261committer Thomas Rast <trast@inf.ethz.ch> 1374485341 +0200
262data 7
263s/6/A/
264from :18
265M 100644 :19 file
266
267blob
268mark :21
269data 50
2701
2712
2723
273A
274A
275A
2767
2778
2789
27910
280B
28112
28213
28314
28415
28516
28617
28718
28819
28920
290
291commit refs/heads/added
292mark :22
293author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
294committer Thomas Rast <trast@inf.ethz.ch> 1374485341 +0200
295data 8
296s/11/B/
297from :20
298M 100644 :21 file
299
300blob
301mark :23
302data 49
3031
3042
3053
306A
307A
308A
3097
3108
3119
31210
313B
314B
31513
31614
31715
31816
31917
32018
32119
32220
323
324commit refs/heads/added
325mark :24
326author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
327committer Thomas Rast <trast@inf.ethz.ch> 1374485341 +0200
328data 8
329s/12/B/
330from :22
331M 100644 :23 file
332
333commit refs/heads/reordered
334mark :25
335author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
336committer Thomas Rast <trast@inf.ethz.ch> 1374485350 +0200
337data 7
338s/5/A/
339from :2
340M 100644 :3 file
341
342blob
343mark :26
344data 50
3451
3462
3473
3484
349A
3506
3517
3528
3539
35410
355B
35612
35713
35814
35915
36016
36117
36218
36319
36420
365
366commit refs/heads/reordered
367mark :27
368author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
369committer Thomas Rast <trast@inf.ethz.ch> 1374485350 +0200
370data 8
371s/11/B/
372from :25
373M 100644 :26 file
374
375blob
376mark :28
377data 49
3781
3792
3803
3814
382A
3836
3847
3858
3869
38710
388B
389B
39013
39114
39215
39316
39417
39518
39619
39720
398
399commit refs/heads/reordered
400mark :29
401author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
402committer Thomas Rast <trast@inf.ethz.ch> 1374485350 +0200
403data 8
404s/12/B/
405from :27
406M 100644 :28 file
407
408commit refs/heads/reordered
409mark :30
410author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
411committer Thomas Rast <trast@inf.ethz.ch> 1374485350 +0200
412data 7
413s/4/A/
414from :29
415M 100644 :9 file
416
417commit refs/heads/changed
418mark :31
419author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
420committer Thomas Rast <trast@inf.ethz.ch> 1374485507 +0200
421data 7
422s/5/A/
423from :2
424M 100644 :3 file
425
426commit refs/heads/changed
427mark :32
428author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
429committer Thomas Rast <trast@inf.ethz.ch> 1374485507 +0200
430data 7
431s/4/A/
432from :31
433M 100644 :5 file
434
435blob
436mark :33
437data 51
4381
4392
4403
441A
442A
4436
4447
4458
4469
44710
448BB
44912
45013
45114
45215
45316
45417
45518
45619
45720
458
459commit refs/heads/changed
460mark :34
461author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
462committer Thomas Rast <trast@inf.ethz.ch> 1374485507 +0200
463data 8
464s/11/B/
465from :32
466M 100644 :33 file
467
468blob
469mark :35
470data 50
4711
4722
4733
474A
475A
4766
4777
4788
4799
48010
481BB
482B
48313
48414
48515
48616
48717
48818
48919
49020
491
492commit refs/heads/changed
493mark :36
494author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
495committer Thomas Rast <trast@inf.ethz.ch> 1374485507 +0200
496data 8
497s/12/B/
498from :34
499M 100644 :35 file
500
501commit refs/heads/changed-message
502mark :37
503author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
504committer Thomas Rast <trast@inf.ethz.ch> 1374485530 +0200
505data 7
506s/5/A/
507from :2
508M 100644 :3 file
509
510commit refs/heads/changed-message
511mark :38
512author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
513committer Thomas Rast <trast@inf.ethz.ch> 1374485530 +0200
514data 35
515s/4/A/
516
517Also a silly comment here!
518from :37
519M 100644 :5 file
520
521commit refs/heads/changed-message
522mark :39
523author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
524committer Thomas Rast <trast@inf.ethz.ch> 1374485536 +0200
525data 8
526s/11/B/
527from :38
528M 100644 :7 file
529
530commit refs/heads/changed-message
531mark :40
532author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
533committer Thomas Rast <trast@inf.ethz.ch> 1374485536 +0200
534data 8
535s/12/B/
536from :39
537M 100644 :9 file
538
539commit refs/heads/unmodified
540mark :41
541author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
542committer Thomas Rast <trast@inf.ethz.ch> 1374485631 +0200
543data 7
544s/5/A/
545from :2
546M 100644 :3 file
547
548commit refs/heads/unmodified
549mark :42
550author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
551committer Thomas Rast <trast@inf.ethz.ch> 1374485631 +0200
552data 7
553s/4/A/
554from :41
555M 100644 :5 file
556
557commit refs/heads/unmodified
558mark :43
559author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
560committer Thomas Rast <trast@inf.ethz.ch> 1374485632 +0200
561data 8
562s/11/B/
563from :42
564M 100644 :7 file
565
566commit refs/heads/unmodified
567mark :44
568author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
569committer Thomas Rast <trast@inf.ethz.ch> 1374485632 +0200
570data 8
571s/12/B/
572from :43
573M 100644 :9 file
574
575commit refs/heads/removed
576mark :45
577author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
578committer Thomas Rast <trast@inf.ethz.ch> 1374486061 +0200
579data 7
580s/5/A/
581from :2
582M 100644 :3 file
583
584commit refs/heads/removed
585mark :46
586author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
587committer Thomas Rast <trast@inf.ethz.ch> 1374486061 +0200
588data 8
589s/11/B/
590from :45
591M 100644 :26 file
592
593commit refs/heads/removed
594mark :47
595author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
596committer Thomas Rast <trast@inf.ethz.ch> 1374486061 +0200
597data 8
598s/12/B/
599from :46
600M 100644 :28 file
601
b66885a3
TG
602commit refs/heads/added-removed
603mark :48
604author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
605committer Thomas Gummerer <t.gummerer@gmail.com> 1556574151 +0100
606data 7
607s/5/A/
608from :2
609M 100644 :3 file
610
611blob
612mark :49
613data 0
614
615commit refs/heads/added-removed
616mark :50
617author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
618committer Thomas Gummerer <t.gummerer@gmail.com> 1556574177 +0100
619data 18
620s/4/A/ + new-file
621from :48
622M 100644 :5 file
623M 100644 :49 new-file
624
625commit refs/heads/added-removed
626mark :51
627author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
628committer Thomas Gummerer <t.gummerer@gmail.com> 1556574177 +0100
629data 22
630s/11/B/ + remove file
631from :50
632M 100644 :7 file
633D new-file
634
635commit refs/heads/added-removed
636mark :52
637author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
638committer Thomas Gummerer <t.gummerer@gmail.com> 1556574177 +0100
639data 8
640s/12/B/
641from :51
642M 100644 :9 file
643
644commit refs/heads/renamed-file
645mark :53
646author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
647committer Thomas Gummerer <t.gummerer@gmail.com> 1556574309 +0100
648data 7
649s/5/A/
650from :2
651M 100644 :3 file
652
653commit refs/heads/renamed-file
654mark :54
655author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
656committer Thomas Gummerer <t.gummerer@gmail.com> 1556574312 +0100
657data 21
658s/4/A/ + rename file
659from :53
660D file
661M 100644 :5 renamed-file
662
663commit refs/heads/renamed-file
664mark :55
665author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
666committer Thomas Gummerer <t.gummerer@gmail.com> 1556574319 +0100
667data 8
668s/11/B/
669from :54
670M 100644 :7 renamed-file
671
672commit refs/heads/renamed-file
673mark :56
674author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
675committer Thomas Gummerer <t.gummerer@gmail.com> 1556574319 +0100
676data 8
677s/12/B/
678from :55
679M 100644 :9 renamed-file
8884cf15 680
2b6a9b13
TG
681commit refs/heads/mode-only-change
682mark :57
683author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
684committer Thomas Gummerer <t.gummerer@gmail.com> 1570473767 +0100
685data 24
686s/4/A/ + add other-file
687from :4
688M 100644 :5 file
689M 100644 :49 other-file
690
691commit refs/heads/mode-only-change
692mark :58
693author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
694committer Thomas Gummerer <t.gummerer@gmail.com> 1570473768 +0100
695data 33
696s/11/B/ + mode change other-file
697from :57
698M 100644 :7 file
699M 100755 :49 other-file
700
701commit refs/heads/mode-only-change
702mark :59
703author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
704committer Thomas Gummerer <t.gummerer@gmail.com> 1570473768 +0100
705data 8
706s/12/B/
707from :58
708M 100644 :9 file
709