Mercurial > evolve

log tests/test-evolve-content-divergence.t @ 3890:840c48296511

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
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
Tue, 12 Jun 2018 23:20:54 +0530 Pulkit Goyal evolve: always order the revs to be evolved
Tue, 12 Jun 2018 21:13:02 +0530 Pulkit Goyal tests: add test of resolution of content-divergent stacks
Tue, 12 Jun 2018 04:01:19 +0530 Pulkit Goyal evolve: point to `hg help evolve.interrupted` while resolving content-div
Thu, 07 Jun 2018 22:59:39 +0530 Pulkit Goyal evolve: store the evolvestate if relocation results in conflicts
Thu, 07 Jun 2018 22:45:54 +0530 Pulkit Goyal tests: add more test of resolution of content-divergent changesets
Thu, 07 Jun 2018 18:18:10 +0530 Pulkit Goyal evolvestate: store info about relocation while resolving content-divergence
Thu, 07 Jun 2018 20:27:03 +0530 Pulkit Goyal evolve: commit the transaction if conflicts occur while merging content-div
Thu, 07 Jun 2018 15:54:32 +0530 Pulkit Goyal tests: add tests for resolving content-divergence when different parents
Fri, 01 Jun 2018 19:52:06 +0530 Pulkit Goyal evolve: implement resolution of content-divergence when on differet parents
Fri, 01 Jun 2018 19:57:19 +0530 Pulkit Goyal tests: add tests for resolving content-divergence with parent change
Wed, 06 Jun 2018 03:26:47 +0530 Pulkit Goyal evolve: pop up editor if conflicts occur while merging commit messages
Mon, 04 Jun 2018 01:28:02 +0530 Pulkit Goyal evolve: merge commit messages while resolving content-divergence (issue5877)
Mon, 04 Jun 2018 04:03:02 +0530 Pulkit Goyal evolve: prompt user for branch selection while resolving content-divergence
less more | (0) tip