Mercurial > evolve
log tests/test-evolve-public-content-divergent.t @ 4416:b2a8e67b0933
age | author | description |
---|---|---|
Fri, 22 Feb 2019 01:02:51 +0530 | Sushil khanchi | evolve: handle a case in pubic-div when merging results in same as public |
Mon, 25 Feb 2019 22:50:24 +0530 | Sushil khanchi | evolve: pin the public cset to local side in merging when solving public div |
Sat, 23 Feb 2019 00:47:14 +0530 | Sushil khanchi | evolve: add tests of relocation case in public divergence |
Tue, 22 Jan 2019 18:40:10 +0530 | Sushil khanchi | evolve: add test for the case where public divergence on difference parents |
Mon, 21 Jan 2019 23:06:10 +0530 | Sushil khanchi | evolve: update the public divergence resolution logic to cover --continue case |
Mon, 21 Jan 2019 23:06:34 +0530 | Sushil khanchi | evolve: add logic to resolve content-divergence with a public cset |