Mercurial Mercurial > pub > hg > evolve / file revisions
summary | shortlog | changelog | graph | tags | bookmarks | branches | file | revisions | annotate | diff | comparison | rss | help
(0) tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-content-divergence.t
2018-09-21 Sushil khanchi evovle: remove redundancy in evolve output file | diff | annotate
2018-09-12 Pierre-Yves David test: update output to match new "pull" phase report file | diff | annotate
2018-08-02 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3 file | diff | annotate
2018-08-02 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4 file | diff | annotate
2018-07-31 Pierre-Yves David test-compat: backout change to 1e103c7f7663 mercurial-4.6 file | diff | annotate
2018-07-20 Pulkit Goyal compat: temporarily move copies fix to compat.py file | diff | annotate
2018-06-07 Pulkit Goyal evolve: continue conflicted relocation content-divergence file | diff | annotate
2018-06-14 Pulkit Goyal evolve: make one missed error to align other error messages file | diff | annotate
2018-06-14 Pulkit Goyal evolve: raise error.InterventionRequired instead of Abort when conflicts file | diff | annotate
2018-06-13 Pulkit Goyal evolve: create resolved cset on successors of current parents file | diff | annotate
2018-06-13 Pulkit Goyal tests: fix a test case to not create conflicts file | diff | annotate
2018-06-13 Pulkit Goyal evolve: create a new commit instead of amending one of the divergents file | diff | annotate
2018-06-12 Pulkit Goyal evolve: always order the revs to be evolved file | diff | annotate
2018-06-12 Pulkit Goyal tests: add test of resolution of content-divergent stacks file | diff | annotate
2018-06-11 Pulkit Goyal evolve: point to `hg help evolve.interrupted` while resolving content-div file | diff | annotate
2018-06-07 Pulkit Goyal evolve: store the evolvestate if relocation results in conflicts file | diff | annotate
2018-06-07 Pulkit Goyal tests: add more test of resolution of content-divergent changesets file | diff | annotate
2018-06-07 Pulkit Goyal evolvestate: store info about relocation while resolving content-divergence file | diff | annotate
2018-06-07 Pulkit Goyal evolve: commit the transaction if conflicts occur while merging content-div file | diff | annotate
2018-06-07 Pulkit Goyal tests: add tests for resolving content-divergence when different parents file | diff | annotate
2018-06-01 Pulkit Goyal evolve: implement resolution of content-divergence when on differet parents file | diff | annotate
2018-06-01 Pulkit Goyal tests: add tests for resolving content-divergence with parent change file | diff | annotate
2018-06-05 Pulkit Goyal evolve: pop up editor if conflicts occur while merging commit messages file | diff | annotate
2018-06-03 Pulkit Goyal evolve: merge commit messages while resolving content-divergence (issue5877) file | diff | annotate
2018-06-03 Pulkit Goyal evolve: prompt user for branch selection while resolving content-divergence file | diff | annotate
less more (0) tip
evolve