tests/test-evolve-issue5832.t
branchmercurial-4.4
changeset 3930 d00f0c369bc7
parent 3714 19ec729f3ca2
parent 3901 f2b8429db565
child 3936 537fd9a86c06
child 4076 f9a850018daa
equal deleted inserted replaced
3929:e709e3817d7e 3930:d00f0c369bc7
    67   |   () draft
    67   |   () draft
    68   | o  6:62fb70414f99 added c
    68   | o  6:62fb70414f99 added c
    69   |/    () draft
    69   |/    () draft
    70   | o  5:7014ec2829cd added a
    70   | o  5:7014ec2829cd added a
    71   |/    () draft
    71   |/    () draft
    72   | *    4:b9b387427a53 merge commit
    72   | o    4:b9b387427a53 merge commit
    73   | |\    () draft
    73   | |\    () draft
    74   +---o  3:9402371b436e added c and d
    74   +---o  3:9402371b436e added c and d
    75   | |     () draft
    75   | |     () draft
    76   | *  2:a1da0651488c added b
    76   | o  2:a1da0651488c added b
    77   | |   () draft
    77   | |   () draft
    78   | x  1:1b24879c5c3c added a
    78   | x  1:1b24879c5c3c added a
    79   |/    () draft
    79   |/    () draft
    80   o  0:bde1d2b6b5e5 added base
    80   o  0:bde1d2b6b5e5 added base
    81       () draft
    81       () draft
    88   |   () draft
    88   |   () draft
    89   | o  6:62fb70414f99 added c
    89   | o  6:62fb70414f99 added c
    90   |/    () draft
    90   |/    () draft
    91   | o  5:7014ec2829cd added a
    91   | o  5:7014ec2829cd added a
    92   |/    () draft
    92   |/    () draft
    93   | *    4:b9b387427a53 merge commit
    93   | o    4:b9b387427a53 merge commit
    94   | |\    () draft
    94   | |\    () draft
    95   +---x  3:9402371b436e added c and d
    95   +---x  3:9402371b436e added c and d
    96   | |     () draft
    96   | |     () draft
    97   | *  2:a1da0651488c added b
    97   | o  2:a1da0651488c added b
    98   | |   () draft
    98   | |   () draft
    99   | x  1:1b24879c5c3c added a
    99   | x  1:1b24879c5c3c added a
   100   |/    () draft
   100   |/    () draft
   101   o  0:bde1d2b6b5e5 added base
   101   o  0:bde1d2b6b5e5 added base
   102       () draft
   102       () draft
   191   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   191   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   192   $ echo l > l
   192   $ echo l > l
   193   $ hg ci -Aqm "added l"
   193   $ hg ci -Aqm "added l"
   194   $ hg grab -r 1b24879c5c3c
   194   $ hg grab -r 1b24879c5c3c
   195   grabbing 1:1b24879c5c3c "added a"
   195   grabbing 1:1b24879c5c3c "added a"
   196   2 new orphan changesets
       
   197 
   196 
   198   $ hg up bde1d2b6b5e5
   197   $ hg up bde1d2b6b5e5
   199   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   198   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   200   $ echo c > c
   199   $ echo c > c
   201   $ hg ci -Aqm "added c"
   200   $ hg ci -Aqm "added c"
   211   |/    () draft
   210   |/    () draft
   212   | o  6:5568b87b1491 added a
   211   | o  6:5568b87b1491 added a
   213   | |   () draft
   212   | |   () draft
   214   | o  5:0a6281e212fe added l
   213   | o  5:0a6281e212fe added l
   215   |/    () draft
   214   |/    () draft
   216   | *    4:b9b387427a53 merge commit
   215   | o    4:b9b387427a53 merge commit
   217   | |\    () draft
   216   | |\    () draft
   218   +---o  3:9402371b436e added c and d
   217   +---o  3:9402371b436e added c and d
   219   | |     () draft
   218   | |     () draft
   220   | *  2:a1da0651488c added b
   219   | o  2:a1da0651488c added b
   221   | |   () draft
   220   | |   () draft
   222   | x  1:1b24879c5c3c added a
   221   | x  1:1b24879c5c3c added a
   223   |/    () draft
   222   |/    () draft
   224   o  0:bde1d2b6b5e5 added base
   223   o  0:bde1d2b6b5e5 added base
   225       () draft
   224       () draft
   234   |/    () draft
   233   |/    () draft
   235   | o  6:5568b87b1491 added a
   234   | o  6:5568b87b1491 added a
   236   | |   () draft
   235   | |   () draft
   237   | o  5:0a6281e212fe added l
   236   | o  5:0a6281e212fe added l
   238   |/    () draft
   237   |/    () draft
   239   | *    4:b9b387427a53 merge commit
   238   | o    4:b9b387427a53 merge commit
   240   | |\    () draft
   239   | |\    () draft
   241   +---x  3:9402371b436e added c and d
   240   +---x  3:9402371b436e added c and d
   242   | |     () draft
   241   | |     () draft
   243   | *  2:a1da0651488c added b
   242   | o  2:a1da0651488c added b
   244   | |   () draft
   243   | |   () draft
   245   | x  1:1b24879c5c3c added a
   244   | x  1:1b24879c5c3c added a
   246   |/    () draft
   245   |/    () draft
   247   o  0:bde1d2b6b5e5 added base
   246   o  0:bde1d2b6b5e5 added base
   248       () draft
   247       () draft
   337   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   336   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   338   $ echo l > l
   337   $ echo l > l
   339   $ hg ci -Aqm "added l"
   338   $ hg ci -Aqm "added l"
   340   $ hg grab -r 1b24879c5c3c
   339   $ hg grab -r 1b24879c5c3c
   341   grabbing 1:1b24879c5c3c "added a"
   340   grabbing 1:1b24879c5c3c "added a"
   342   2 new orphan changesets
       
   343 
   341 
   344   $ hg up bde1d2b6b5e5
   342   $ hg up bde1d2b6b5e5
   345   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   343   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   346   $ echo c > c
   344   $ echo c > c
   347   $ hg ci -Aqm "added c"
   345   $ hg ci -Aqm "added c"
   357   |/    () draft
   355   |/    () draft
   358   | o  6:5568b87b1491 added a
   356   | o  6:5568b87b1491 added a
   359   | |   () draft
   357   | |   () draft
   360   | o  5:0a6281e212fe added l
   358   | o  5:0a6281e212fe added l
   361   |/    () draft
   359   |/    () draft
   362   | *    4:b9b387427a53 merge commit
   360   | o    4:b9b387427a53 merge commit
   363   | |\    () draft
   361   | |\    () draft
   364   +---o  3:9402371b436e added c and d
   362   +---o  3:9402371b436e added c and d
   365   | |     () draft
   363   | |     () draft
   366   | *  2:a1da0651488c added b
   364   | o  2:a1da0651488c added b
   367   | |   () draft
   365   | |   () draft
   368   | x  1:1b24879c5c3c added a
   366   | x  1:1b24879c5c3c added a
   369   |/    () draft
   367   |/    () draft
   370   o  0:bde1d2b6b5e5 added base
   368   o  0:bde1d2b6b5e5 added base
   371       () draft
   369       () draft
   380   |/    () draft
   378   |/    () draft
   381   | o  6:5568b87b1491 added a
   379   | o  6:5568b87b1491 added a
   382   | |   () draft
   380   | |   () draft
   383   | o  5:0a6281e212fe added l
   381   | o  5:0a6281e212fe added l
   384   |/    () draft
   382   |/    () draft
   385   | *    4:b9b387427a53 merge commit
   383   | o    4:b9b387427a53 merge commit
   386   | |\    () draft
   384   | |\    () draft
   387   +---x  3:9402371b436e added c and d
   385   +---x  3:9402371b436e added c and d
   388   | |     () draft
   386   | |     () draft
   389   | *  2:a1da0651488c added b
   387   | o  2:a1da0651488c added b
   390   | |   () draft
   388   | |   () draft
   391   | x  1:1b24879c5c3c added a
   389   | x  1:1b24879c5c3c added a
   392   |/    () draft
   390   |/    () draft
   393   o  0:bde1d2b6b5e5 added base
   391   o  0:bde1d2b6b5e5 added base
   394       () draft
   392       () draft