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-public-content-divergent.t
Fri, 05 Apr 2019 17:45:59 +0200 Pierre-Yves David evolve: fix divergence resolution when not merging a descendant file | diff | annotate
Fri, 29 Mar 2019 15:15:07 +0100 Pierre-Yves David test: fix a phase divergence test case to actually not contains conflict file | diff | annotate
Fri, 05 Apr 2019 16:31:45 +0200 Pierre-Yves David tests: use current instability names everywhere file | diff | annotate
Tue, 26 Mar 2019 12:30:10 +0100 Pierre-Yves David evolve: drop the "computing new diff message" for phase-divergence file | diff | annotate
Sun, 24 Mar 2019 21:30:12 +0530 Pierre-Yves David evolve: test a common case of public divergence file | diff | annotate
Sat, 09 Mar 2019 19:25:34 +0530 Sushil khanchi evolve: warn user if cset desc is being lost file | diff | annotate
Sat, 02 Mar 2019 02:34:29 +0530 Sushil khanchi evolve: add a test in pubdiv where only merging leads to conflict file | diff | annotate
Thu, 28 Feb 2019 03:12:39 +0530 Sushil khanchi evolve: cover continue case in pubdiv when merging results in same as public file | diff | annotate
Fri, 22 Feb 2019 01:02:51 +0530 Sushil khanchi evolve: handle a case in pubic-div when merging results in same as public file | diff | annotate
Mon, 25 Feb 2019 22:50:24 +0530 Sushil khanchi evolve: pin the public cset to local side in merging when solving public div file | diff | annotate
Sat, 23 Feb 2019 00:47:14 +0530 Sushil khanchi evolve: add tests of relocation case in public divergence file | diff | annotate
Tue, 22 Jan 2019 18:40:10 +0530 Sushil khanchi evolve: add test for the case where public divergence on difference parents file | diff | annotate
Mon, 21 Jan 2019 23:06:10 +0530 Sushil khanchi evolve: update the public divergence resolution logic to cover --continue case file | diff | annotate
Mon, 21 Jan 2019 23:06:34 +0530 Sushil khanchi evolve: add logic to resolve content-divergence with a public cset file | diff | annotate
less more (0) tip
evolve