tests/test-merge1.t
Mon, 23 Nov 2020 23:08:58 -0800 Martin von Zweigbergk errors: raise StateError on uncommitted changes when merge starts
Fri, 20 Nov 2020 14:43:21 -0800 Martin von Zweigbergk errors: raise ConfigError on failure to parse config file
Thu, 22 Oct 2020 13:56:01 -0700 Martin von Zweigbergk errors: set detailed exit code to 30 for config errors
Mon, 12 Oct 2020 12:44:18 -0700 Martin von Zweigbergk errors: introduce StateError and use it from commands and cmdutil
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
Tue, 12 Jan 2016 18:38:49 -0800 Siddharth Agarwal merge: split up checks for unknown and ignored files that differ
Sat, 02 Jan 2016 03:11:52 -0800 Siddharth Agarwal merge: add options to warn or ignore on colliding unknown files
Mon, 28 Dec 2015 22:51:37 -0800 Siddharth Agarwal merge: while checking for unknown files don't follow symlinks (issue5027) stable
Thu, 08 Oct 2015 12:55:45 -0700 Pierre-Yves David error: get Abort from 'error' instead of 'util'
Wed, 08 Jul 2015 17:01:09 +0900 FUJIWARA Katsunori context: write dirstate out explicitly after marking files as clean
Fri, 29 May 2015 22:23:58 +0200 Gilles Moris summary: move the parents phase marker to commit line (issue4688)
Thu, 14 May 2015 17:38:38 +0200 Gilles Moris summary: add a phase line (draft, secret) to the output
Mon, 23 Sep 2013 20:50:51 -0700 Siddharth Agarwal merge: standardize error message for dirty working dir
Thu, 25 Jul 2013 02:44:27 -0500 Matt Mackall tests: glob out exception type for directory collision stable
Thu, 25 Jul 2013 00:33:28 -0500 Matt Mackall update: add tracking of interrupted updates (issue3113) stable
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Wed, 11 Jan 2012 15:53:42 -0500 Jordi GutiƩrrez Hermoso merge: report all files in _checkunknown
Wed, 07 Dec 2011 11:23:01 -0600 Kevin Bullock merge: make 'nothing to merge' aborts consistent
Thu, 13 Oct 2011 04:27:49 +0200 Mads Kiilerich tests: cleanup of echo statements left over from test conversion
Tue, 19 Apr 2011 12:04:44 +0200 Martin Geisler tests: remove redundant mkdir
Fri, 18 Feb 2011 03:35:01 +0100 Mads Kiilerich util: flush stdout before calling external processes stable
Sat, 09 Oct 2010 14:50:20 -0500 Matt Mackall merge: handle no file parent in backwards merge (issue2364)
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests
Thu, 02 Sep 2010 23:22:51 +0200 Martin Geisler tests: remove unneeded -d flags
Wed, 18 Aug 2010 05:05:51 +0530 Pradeepkumar Gayam tests: unify test-merge1
less more (0) tip