tests/test-fastexport.t
branchstable
changeset 44777 edffab2cf0ea
parent 44691 44aff45b556d
equal deleted inserted replaced
44776:f71c8eea7161 44777:edffab2cf0ea
     8   $ hg debugbuilddag -mon '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
     8   $ hg debugbuilddag -mon '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
     9 
     9 
    10   $ hg up -r 10
    10   $ hg up -r 10
    11   13 files updated, 0 files merged, 0 files removed, 0 files unresolved
    11   13 files updated, 0 files merged, 0 files removed, 0 files unresolved
    12   $ hg rm nf10
    12   $ hg rm nf10
    13   $ hg commit -u debugbuilddag --date 'Thu Jan 01 00:00:12 1970 +0000' -m r12
    13   $ hg commit -u debugbuilddag --date 'Thu Jan 01 02:30:12 1970 +0230' -m r12
    14   created new head
    14   created new head
    15   $ hg up -r 11
    15   $ hg up -r 11
    16   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
    16   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
    17   $ hg merge -r 12
    17   $ hg merge -r 12
    18   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    18   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    19   (branch merge, don't forget to commit)
    19   (branch merge, don't forget to commit)
    20   $ hg commit -m debugbuilddag --date 'Thu Jan 01 00:00:13 1970 +0000'
    20   $ hg commit -m debugbuilddag --date 'Thu Jan 01 00:00:13 1970 +0000'
    21 
    21 
    22   $ hg log -G
    22   $ hg log -G
    23   @    changeset:   13:e5c379648af4
    23   @    changeset:   13:5544befcb7ce
    24   |\   branch:      both
    24   |\   branch:      both
    25   | |  tag:         tip
    25   | |  tag:         tip
    26   | |  parent:      11:2cbd52c10e88
    26   | |  parent:      11:2cbd52c10e88
    27   | |  parent:      12:4f31c9604af6
    27   | |  parent:      12:66d0c21243be
    28   | |  user:        test
    28   | |  user:        test
    29   | |  date:        Thu Jan 01 00:00:13 1970 +0000
    29   | |  date:        Thu Jan 01 00:00:13 1970 +0000
    30   | |  summary:     debugbuilddag
    30   | |  summary:     debugbuilddag
    31   | |
    31   | |
    32   | o  changeset:   12:4f31c9604af6
    32   | o  changeset:   12:66d0c21243be
    33   | |  branch:      both
    33   | |  branch:      both
    34   | |  parent:      10:9220596cb068
    34   | |  parent:      10:9220596cb068
    35   | |  user:        debugbuilddag
    35   | |  user:        debugbuilddag
    36   | |  date:        Thu Jan 01 00:00:12 1970 +0000
    36   | |  date:        Thu Jan 01 02:30:12 1970 +0230
    37   | |  summary:     r12
    37   | |  summary:     r12
    38   | |
    38   | |
    39   o |  changeset:   11:2cbd52c10e88
    39   o |  changeset:   11:2cbd52c10e88
    40   |/   branch:      both
    40   |/   branch:      both
    41   |    tag:         tmaintip
    41   |    tag:         tmaintip
   148   data 3
   148   data 3
   149   r0
   149   r0
   150   
   150   
   151   commit refs/heads/default
   151   commit refs/heads/default
   152   mark :3
   152   mark :3
   153   committer "debugbuilddag" <debugbuilddag> 0 -0000
   153   committer "debugbuilddag" <debugbuilddag> 0 +0000
   154   data 2
   154   data 2
   155   r0
   155   r0
   156   M 644 :1 mf
   156   M 644 :1 mf
   157   M 644 :2 nf0
   157   M 644 :2 nf0
   158   M 644 :2 of
   158   M 644 :2 of
   195   data 3
   195   data 3
   196   r1
   196   r1
   197   
   197   
   198   commit refs/heads/default
   198   commit refs/heads/default
   199   mark :7
   199   mark :7
   200   committer "debugbuilddag" <debugbuilddag> 1 -0000
   200   committer "debugbuilddag" <debugbuilddag> 1 +0000
   201   data 2
   201   data 2
   202   r1
   202   r1
   203   from :3
   203   from :3
   204   M 644 :4 mf
   204   M 644 :4 mf
   205   M 644 :5 nf1
   205   M 644 :5 nf1
   243   data 3
   243   data 3
   244   r2
   244   r2
   245   
   245   
   246   commit refs/heads/name1
   246   commit refs/heads/name1
   247   mark :11
   247   mark :11
   248   committer "debugbuilddag" <debugbuilddag> 2 -0000
   248   committer "debugbuilddag" <debugbuilddag> 2 +0000
   249   data 2
   249   data 2
   250   r2
   250   r2
   251   from :7
   251   from :7
   252   M 644 :8 mf
   252   M 644 :8 mf
   253   M 644 :9 nf2
   253   M 644 :9 nf2
   291   data 3
   291   data 3
   292   r3
   292   r3
   293   
   293   
   294   commit refs/heads/name1
   294   commit refs/heads/name1
   295   mark :15
   295   mark :15
   296   committer "debugbuilddag" <debugbuilddag> 3 -0000
   296   committer "debugbuilddag" <debugbuilddag> 3 +0000
   297   data 2
   297   data 2
   298   r3
   298   r3
   299   from :11
   299   from :11
   300   M 644 :12 mf
   300   M 644 :12 mf
   301   M 644 :13 nf3
   301   M 644 :13 nf3
   339   data 3
   339   data 3
   340   r4
   340   r4
   341   
   341   
   342   commit refs/heads/name1
   342   commit refs/heads/name1
   343   mark :19
   343   mark :19
   344   committer "debugbuilddag" <debugbuilddag> 4 -0000
   344   committer "debugbuilddag" <debugbuilddag> 4 +0000
   345   data 2
   345   data 2
   346   r4
   346   r4
   347   from :15
   347   from :15
   348   M 644 :16 mf
   348   M 644 :16 mf
   349   M 644 :17 nf4
   349   M 644 :17 nf4
   387   data 3
   387   data 3
   388   r5
   388   r5
   389   
   389   
   390   commit refs/heads/name2
   390   commit refs/heads/name2
   391   mark :23
   391   mark :23
   392   committer "debugbuilddag" <debugbuilddag> 5 -0000
   392   committer "debugbuilddag" <debugbuilddag> 5 +0000
   393   data 2
   393   data 2
   394   r5
   394   r5
   395   from :7
   395   from :7
   396   M 644 :20 mf
   396   M 644 :20 mf
   397   M 644 :21 nf5
   397   M 644 :21 nf5
   435   data 3
   435   data 3
   436   r6
   436   r6
   437   
   437   
   438   commit refs/heads/name2
   438   commit refs/heads/name2
   439   mark :27
   439   mark :27
   440   committer "debugbuilddag" <debugbuilddag> 6 -0000
   440   committer "debugbuilddag" <debugbuilddag> 6 +0000
   441   data 2
   441   data 2
   442   r6
   442   r6
   443   from :23
   443   from :23
   444   M 644 :24 mf
   444   M 644 :24 mf
   445   M 644 :25 nf6
   445   M 644 :25 nf6
   483   data 3
   483   data 3
   484   r7
   484   r7
   485   
   485   
   486   commit refs/heads/name2
   486   commit refs/heads/name2
   487   mark :31
   487   mark :31
   488   committer "debugbuilddag" <debugbuilddag> 7 -0000
   488   committer "debugbuilddag" <debugbuilddag> 7 +0000
   489   data 2
   489   data 2
   490   r7
   490   r7
   491   from :27
   491   from :27
   492   M 644 :28 mf
   492   M 644 :28 mf
   493   M 644 :29 nf7
   493   M 644 :29 nf7
   531   data 3
   531   data 3
   532   r8
   532   r8
   533   
   533   
   534   commit refs/heads/name2
   534   commit refs/heads/name2
   535   mark :35
   535   mark :35
   536   committer "debugbuilddag" <debugbuilddag> 8 -0000
   536   committer "debugbuilddag" <debugbuilddag> 8 +0000
   537   data 2
   537   data 2
   538   r8
   538   r8
   539   from :31
   539   from :31
   540   M 644 :32 mf
   540   M 644 :32 mf
   541   M 644 :33 nf8
   541   M 644 :33 nf8
   579   data 3
   579   data 3
   580   r9
   580   r9
   581   
   581   
   582   commit refs/heads/both
   582   commit refs/heads/both
   583   mark :39
   583   mark :39
   584   committer "debugbuilddag" <debugbuilddag> 9 -0000
   584   committer "debugbuilddag" <debugbuilddag> 9 +0000
   585   data 2
   585   data 2
   586   r9
   586   r9
   587   from :35
   587   from :35
   588   merge :19
   588   merge :19
   589   M 644 :36 mf
   589   M 644 :36 mf
   631   data 4
   631   data 4
   632   r10
   632   r10
   633   
   633   
   634   commit refs/heads/both
   634   commit refs/heads/both
   635   mark :43
   635   mark :43
   636   committer "debugbuilddag" <debugbuilddag> 10 -0000
   636   committer "debugbuilddag" <debugbuilddag> 10 +0000
   637   data 3
   637   data 3
   638   r10
   638   r10
   639   from :39
   639   from :39
   640   M 644 :40 mf
   640   M 644 :40 mf
   641   M 644 :41 nf10
   641   M 644 :41 nf10
   679   data 4
   679   data 4
   680   r11
   680   r11
   681   
   681   
   682   commit refs/heads/both
   682   commit refs/heads/both
   683   mark :47
   683   mark :47
   684   committer "debugbuilddag" <debugbuilddag> 11 -0000
   684   committer "debugbuilddag" <debugbuilddag> 11 +0000
   685   data 3
   685   data 3
   686   r11
   686   r11
   687   from :43
   687   from :43
   688   M 644 :44 mf
   688   M 644 :44 mf
   689   M 644 :45 nf11
   689   M 644 :45 nf11
   690   M 644 :46 of
   690   M 644 :46 of
   691   
   691   
   692   commit refs/heads/both
   692   commit refs/heads/both
   693   mark :48
   693   mark :48
   694   committer "debugbuilddag" <debugbuilddag> 12 -0000
   694   committer "debugbuilddag" <debugbuilddag> 12 +0230
   695   data 3
   695   data 3
   696   r12
   696   r12
   697   from :43
   697   from :43
   698   D nf10
   698   D nf10
   699   
   699   
   700   commit refs/heads/both
   700   commit refs/heads/both
   701   mark :49
   701   mark :49
   702   committer "test" <test> 13 -0000
   702   committer "test" <test> 13 +0000
   703   data 13
   703   data 13
   704   debugbuilddag
   704   debugbuilddag
   705   from :47
   705   from :47
   706   merge :48
   706   merge :48
   707   D nf10
   707   D nf10
   752   9220596cb068dfc73e2f7e695dc8ad0858a936db
   752   9220596cb068dfc73e2f7e695dc8ad0858a936db
   753   32abd0da49b7c7ee756298fc46a15584d6aedc99
   753   32abd0da49b7c7ee756298fc46a15584d6aedc99
   754   33fbc651630ffa7ccbebfe4eb91320a873e7291c
   754   33fbc651630ffa7ccbebfe4eb91320a873e7291c
   755   868d828870663d075cdcff502d26cf8445ce068e
   755   868d828870663d075cdcff502d26cf8445ce068e
   756   2cbd52c10e88ce604402dc83a869ec4f07765b3d
   756   2cbd52c10e88ce604402dc83a869ec4f07765b3d
   757   4f31c9604af676986343d775b05695f535e8db5e
   757   66d0c21243be072f82ced64aa730ab0367252451
   758   e5c379648af4c9fa3b5546ab7ee6e61a36082830
   758   5544befcb7ce4a558ed9e19909e16af574a2a3c6
   759 
   759 
   760   $ hg fastexport --export-marks fastexport.marks2 -r 0
   760   $ hg fastexport --export-marks fastexport.marks2 -r 0
   761   blob
   761   blob
   762   mark :1
   762   mark :1
   763   data 65
   763   data 65
   791   data 3
   791   data 3
   792   r0
   792   r0
   793   
   793   
   794   commit refs/heads/default
   794   commit refs/heads/default
   795   mark :3
   795   mark :3
   796   committer "debugbuilddag" <debugbuilddag> 0 -0000
   796   committer "debugbuilddag" <debugbuilddag> 0 +0000
   797   data 2
   797   data 2
   798   r0
   798   r0
   799   M 644 :1 mf
   799   M 644 :1 mf
   800   M 644 :2 nf0
   800   M 644 :2 nf0
   801   M 644 :2 of
   801   M 644 :2 of
   843   data 3
   843   data 3
   844   r1
   844   r1
   845   
   845   
   846   commit refs/heads/default
   846   commit refs/heads/default
   847   mark :7
   847   mark :7
   848   committer "debugbuilddag" <debugbuilddag> 1 -0000
   848   committer "debugbuilddag" <debugbuilddag> 1 +0000
   849   data 2
   849   data 2
   850   r1
   850   r1
   851   from :3
   851   from :3
   852   M 644 :4 mf
   852   M 644 :4 mf
   853   M 644 :5 nf1
   853   M 644 :5 nf1
   859   blob
   859   blob
   860   mark :50
   860   mark :50
   861   data 4
   861   data 4
   862   foo
   862   foo
   863   
   863   
   864   abort: Unable to parse user into person and email for revision 4f71ca786403919cd16669d94ff7cd1c09437a44
   864   abort: Unable to parse user into person and email for revision 65a3f69b9b519de73d755472c1ab05990ab8a7f7
   865   [255]
   865   [255]