log tests/test-merge1.t @ 45839:ebee234d952a

age author description
Thu, 08 Oct 2020 15:35:44 -0700 Martin von Zweigbergk errors: stop passing non-strings to Abort's constructor
Thu, 03 Oct 2019 13:18:15 -0700 Martin von Zweigbergk unfinishedstate: suggested `hg update .` (including `.`) to complete update
Sun, 09 Jun 2019 02:12:58 +0530 Taapas Agrawal statecheck: added support for STATES
Sun, 09 Dec 2018 21:23:34 -0500 Matt Harbison py3: quote several instances of $PYTHON for Windows
Wed, 12 Sep 2018 23:10:59 -0400 Matt Harbison tests: stabilize change for handling not quoting non-empty-directory
Wed, 12 Sep 2018 11:38:46 -0400 Augie Fackler tests: handle Python 3 not quoting non-empty-directory error
Fri, 07 Sep 2018 23:39:49 -0400 Matt Harbison tests: conditionalize an error message about unlinking a non empty directory
Sun, 19 Aug 2018 13:27:02 +0900 Yuya Nishihara merge: do not delete untracked files silently (issue5962) stable
Tue, 24 Oct 2017 11:15:30 -0700 Siddharth Agarwal merge: disable path conflict checking by default (issue5716) stable
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: improve error messages for path conflicts during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: check for path conflicts when updating (issue5628)
Tue, 22 Aug 2017 16:58:43 -0400 Augie Fackler tests: update test-merge1 to pass our import checker
Thu, 15 Jun 2017 14:22:25 -0400 Augie Fackler tests: clean up many print statements to be print functions instead
Tue, 20 Jun 2017 17:31:18 -0400 Augie Fackler tests: clean up even more direct `python` calls with $PYTHON
Fri, 01 Jul 2016 17:42:55 +0200 Kostia Balytskyi update: teach hg to override untracked dir with a tracked file on update