Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-issue5832.t
branchmercurial-4.4
changeset 4675 79bc0f1a832e
parent 4516 f54bb6eaf5e6
parent 4577 bcd52ce0916d
equal deleted inserted replaced
4674:3810ca63398f 4675:79bc0f1a832e 
    50 
    50 
    51   $ hg up 1b24879c5c3c
 
    51   $ hg up 1b24879c5c3c
 
    52   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
    52   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
    53   $ echo foo > a
 
    53   $ echo foo > a
 
    54   $ hg amend
 
    54   $ hg amend
 
    55   2 new orphan changesets
 
       
    56 
    55 
    57   $ hg up bde1d2b6b5e5
 
    56   $ hg up bde1d2b6b5e5
 
    58   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    57   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    59   $ echo c > c
 
    58   $ echo c > c
 
    60   $ hg ci -Aqm "added c"
 
    59   $ hg ci -Aqm "added c"
 
    67   |   () draft
 
    66   |   () draft
 
    68   | o  6:62fb70414f99 added c
 
    67   | o  6:62fb70414f99 added c
 
    69   |/    () draft
 
    68   |/    () draft
 
    70   | o  5:7014ec2829cd added a
 
    69   | o  5:7014ec2829cd added a
 
    71   |/    () draft
 
    70   |/    () draft
 
    72   | *    4:b9b387427a53 merge commit
 
    71   | o    4:b9b387427a53 merge commit
 
    73   | |\    () draft
 
    72   | |\    () draft
 
    74   +---o  3:9402371b436e added c and d
 
    73   +---o  3:9402371b436e added c and d
 
    75   | |     () draft
 
    74   | |     () draft
 
    76   | *  2:a1da0651488c added b
 
    75   | o  2:a1da0651488c added b
 
    77   | |   () draft
 
    76   | |   () draft
 
    78   | x  1:1b24879c5c3c added a
 
    77   | x  1:1b24879c5c3c added a
 
    79   |/    () draft
 
    78   |/    () draft
 
    80   o  0:bde1d2b6b5e5 added base
 
    79   o  0:bde1d2b6b5e5 added base
 
    81       () draft
 
    80       () draft
 
    88   |   () draft
 
    87   |   () draft
 
    89   | o  6:62fb70414f99 added c
 
    88   | o  6:62fb70414f99 added c
 
    90   |/    () draft
 
    89   |/    () draft
 
    91   | o  5:7014ec2829cd added a
 
    90   | o  5:7014ec2829cd added a
 
    92   |/    () draft
 
    91   |/    () draft
 
    93   | *    4:b9b387427a53 merge commit
 
    92   | o    4:b9b387427a53 merge commit
 
    94   | |\    () draft
 
    93   | |\    () draft
 
    95   +---x  3:9402371b436e added c and d
 
    94   +---x  3:9402371b436e added c and d
 
    96   | |     () draft
 
    95   | |     () draft
 
    97   | *  2:a1da0651488c added b
 
    96   | o  2:a1da0651488c added b
 
    98   | |   () draft
 
    97   | |   () draft
 
    99   | x  1:1b24879c5c3c added a
 
    98   | x  1:1b24879c5c3c added a
 
   100   |/    () draft
 
    99   |/    () draft
 
   101   o  0:bde1d2b6b5e5 added base
 
   100   o  0:bde1d2b6b5e5 added base
 
   102       () draft
 
   101       () draft
 
   189   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
 
   188   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
 
   190   $ echo l > l
 
   189   $ echo l > l
 
   191   $ hg ci -Aqm "added l"
 
   190   $ hg ci -Aqm "added l"
 
   192   $ hg pick -r 1b24879c5c3c
 
   191   $ hg pick -r 1b24879c5c3c
 
   193   picking 1:1b24879c5c3c "added a"
 
   192   picking 1:1b24879c5c3c "added a"
 
   194   2 new orphan changesets
 
       
   195 
   193 
   196   $ hg up bde1d2b6b5e5
 
   194   $ hg up bde1d2b6b5e5
 
   197   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   195   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   198   $ echo c > c
 
   196   $ echo c > c
 
   199   $ hg ci -Aqm "added c"
 
   197   $ hg ci -Aqm "added c"
 
   209   |/    () draft
 
   207   |/    () draft
 
   210   | o  6:5568b87b1491 added a
 
   208   | o  6:5568b87b1491 added a
 
   211   | |   () draft
 
   209   | |   () draft
 
   212   | o  5:0a6281e212fe added l
 
   210   | o  5:0a6281e212fe added l
 
   213   |/    () draft
 
   211   |/    () draft
 
   214   | *    4:b9b387427a53 merge commit
 
   212   | o    4:b9b387427a53 merge commit
 
   215   | |\    () draft
 
   213   | |\    () draft
 
   216   +---o  3:9402371b436e added c and d
 
   214   +---o  3:9402371b436e added c and d
 
   217   | |     () draft
 
   215   | |     () draft
 
   218   | *  2:a1da0651488c added b
 
   216   | o  2:a1da0651488c added b
 
   219   | |   () draft
 
   217   | |   () draft
 
   220   | x  1:1b24879c5c3c added a
 
   218   | x  1:1b24879c5c3c added a
 
   221   |/    () draft
 
   219   |/    () draft
 
   222   o  0:bde1d2b6b5e5 added base
 
   220   o  0:bde1d2b6b5e5 added base
 
   223       () draft
 
   221       () draft
 
   232   |/    () draft
 
   230   |/    () draft
 
   233   | o  6:5568b87b1491 added a
 
   231   | o  6:5568b87b1491 added a
 
   234   | |   () draft
 
   232   | |   () draft
 
   235   | o  5:0a6281e212fe added l
 
   233   | o  5:0a6281e212fe added l
 
   236   |/    () draft
 
   234   |/    () draft
 
   237   | *    4:b9b387427a53 merge commit
 
   235   | o    4:b9b387427a53 merge commit
 
   238   | |\    () draft
 
   236   | |\    () draft
 
   239   +---x  3:9402371b436e added c and d
 
   237   +---x  3:9402371b436e added c and d
 
   240   | |     () draft
 
   238   | |     () draft
 
   241   | *  2:a1da0651488c added b
 
   239   | o  2:a1da0651488c added b
 
   242   | |   () draft
 
   240   | |   () draft
 
   243   | x  1:1b24879c5c3c added a
 
   241   | x  1:1b24879c5c3c added a
 
   244   |/    () draft
 
   242   |/    () draft
 
   245   o  0:bde1d2b6b5e5 added base
 
   243   o  0:bde1d2b6b5e5 added base
 
   246       () draft
 
   244       () draft
 
   335   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
 
   333   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
 
   336   $ echo l > l
 
   334   $ echo l > l
 
   337   $ hg ci -Aqm "added l"
 
   335   $ hg ci -Aqm "added l"
 
   338   $ hg pick -r 1b24879c5c3c
 
   336   $ hg pick -r 1b24879c5c3c
 
   339   picking 1:1b24879c5c3c "added a"
 
   337   picking 1:1b24879c5c3c "added a"
 
   340   2 new orphan changesets
 
       
   341 
   338 
   342   $ hg up bde1d2b6b5e5
 
   339   $ hg up bde1d2b6b5e5
 
   343   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   340   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   344   $ echo c > c
 
   341   $ echo c > c
 
   345   $ hg ci -Aqm "added c"
 
   342   $ hg ci -Aqm "added c"
 
   355   |/    () draft
 
   352   |/    () draft
 
   356   | o  6:5568b87b1491 added a
 
   353   | o  6:5568b87b1491 added a
 
   357   | |   () draft
 
   354   | |   () draft
 
   358   | o  5:0a6281e212fe added l
 
   355   | o  5:0a6281e212fe added l
 
   359   |/    () draft
 
   356   |/    () draft
 
   360   | *    4:b9b387427a53 merge commit
 
   357   | o    4:b9b387427a53 merge commit
 
   361   | |\    () draft
 
   358   | |\    () draft
 
   362   +---o  3:9402371b436e added c and d
 
   359   +---o  3:9402371b436e added c and d
 
   363   | |     () draft
 
   360   | |     () draft
 
   364   | *  2:a1da0651488c added b
 
   361   | o  2:a1da0651488c added b
 
   365   | |   () draft
 
   362   | |   () draft
 
   366   | x  1:1b24879c5c3c added a
 
   363   | x  1:1b24879c5c3c added a
 
   367   |/    () draft
 
   364   |/    () draft
 
   368   o  0:bde1d2b6b5e5 added base
 
   365   o  0:bde1d2b6b5e5 added base
 
   369       () draft
 
   366       () draft
 
   378   |/    () draft
 
   375   |/    () draft
 
   379   | o  6:5568b87b1491 added a
 
   376   | o  6:5568b87b1491 added a
 
   380   | |   () draft
 
   377   | |   () draft
 
   381   | o  5:0a6281e212fe added l
 
   378   | o  5:0a6281e212fe added l
 
   382   |/    () draft
 
   379   |/    () draft
 
   383   | *    4:b9b387427a53 merge commit
 
   380   | o    4:b9b387427a53 merge commit
 
   384   | |\    () draft
 
   381   | |\    () draft
 
   385   +---x  3:9402371b436e added c and d
 
   382   +---x  3:9402371b436e added c and d
 
   386   | |     () draft
 
   383   | |     () draft
 
   387   | *  2:a1da0651488c added b
 
   384   | o  2:a1da0651488c added b
 
   388   | |   () draft
 
   385   | |   () draft
 
   389   | x  1:1b24879c5c3c added a
 
   386   | x  1:1b24879c5c3c added a
 
   390   |/    () draft
 
   387   |/    () draft
 
   391   o  0:bde1d2b6b5e5 added base
 
   388   o  0:bde1d2b6b5e5 added base
 
   392       () draft
 
   389       () draft
evolve