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-unstability-resolution-result.t
branchmercurial-4.6
changeset 5368 844b1ad5b34b
parent 5359 01bcd39c432c
equal deleted inserted replaced
5284:0471b9ddd0b2 5368:844b1ad5b34b 
    64   102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
 
    64   102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
 
    65   cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
 
    65   cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
 
    66 
    66 
    67 Test evolve of orphan that run into conflict
 
    67 Test evolve of orphan that run into conflict
 
    68 
    68 
    69   $ ls
 
    69   $ ls -A
 
       
    70   .hg
 
    70   a
 
    71   a
 
    71   b
 
    72   b
 
    72   $ hg pdiff a
 
    73   $ hg pdiff a
 
    73   diff -r 07f494440405 a
 
    74   diff -r 07f494440405 a
 
    74   --- a/a	Thu Jan 01 00:00:00 1970 +0000
 
    75   --- a/a	Thu Jan 01 00:00:00 1970 +0000
evolve