Mercurial > evolve
log tests/test-evolve-content-divergence.t @ 4000:0a05d1b98ccc
| age | author | description |
|---|---|---|
| Sat, 21 Jul 2018 02:42:29 +0530 | Pulkit Goyal | compat: temporarily move copies fix to compat.py |
| Thu, 07 Jun 2018 18:18:30 +0530 | Pulkit Goyal | evolve: continue conflicted relocation content-divergence |
| Fri, 15 Jun 2018 00:50:17 +0530 | Pulkit Goyal | evolve: make one missed error to align other error messages |
| Fri, 15 Jun 2018 00:16:29 +0530 | Pulkit Goyal | evolve: raise error.InterventionRequired instead of Abort when conflicts |
| Thu, 14 Jun 2018 01:39:33 +0530 | Pulkit Goyal | evolve: create resolved cset on successors of current parents |
| Thu, 14 Jun 2018 01:39:11 +0530 | Pulkit Goyal | tests: fix a test case to not create conflicts |
| Wed, 13 Jun 2018 17:15:10 +0530 | Pulkit Goyal | evolve: create a new commit instead of amending one of the divergents |