evolve: File revisions

Mercurial Mercurial > pub > hg > evolve / file revisions

tests/test-evolve-abort-contentdiv.t

Fri, 15 Jun 2018 00:16:29 +0530	Pulkit Goyal	evolve: raise error.InterventionRequired instead of Abort when conflicts	file \| diff \| annotate
Wed, 13 Jun 2018 17:15:10 +0530	Pulkit Goyal	evolve: create a new commit instead of amending one of the divergents	file \| diff \| annotate
Tue, 12 Jun 2018 04:01:19 +0530	Pulkit Goyal	evolve: point to `hg help evolve.interrupted` while resolving content-div	file \| diff \| annotate
Tue, 12 Jun 2018 03:29:13 +0530	Pulkit Goyal	tests: add test about aborting content-divergence when multiple parents	file \| diff \| annotate
Wed, 06 Jun 2018 04:29:05 +0530	Pulkit Goyal	evolve: show unfinished information in `hg status -v` (issue5886)	file \| diff \| annotate
Mon, 11 Jun 2018 20:17:56 +0530	Pulkit Goyal	evolve: strip the extra obsmarkers if any on `hg evolve --abort`	file \| diff \| annotate
Thu, 24 May 2018 02:12:14 +0530	Pulkit Goyal	evolve: return the new node formed only as the replacement	file \| diff \| annotate
Thu, 24 May 2018 17:04:20 +0530	Pulkit Goyal	tests: add more test of --abort flag for content-divergence resolution	file \| diff \| annotate
Thu, 24 May 2018 02:02:11 +0530	Pulkit Goyal	tests: add tests for testing --abort while content-divergence resolution	file \| diff \| annotate

evolve