tests/test-rebase-conflicts.t
Wed, 02 Nov 2016 18:59:29 +0000 timeless rebase: check for conflicts before continuing
Fri, 14 Oct 2016 01:31:11 +0200 Pierre-Yves David changegroup: skip delta when the underlying revlog do not use them
Thu, 13 Oct 2016 02:19:43 +0200 Gábor Stefanik mergecopies: invoke _computenonoverlap for both base and tca during merges
Tue, 20 Sep 2016 23:48:08 +0000 timeless localrepo: use single quotes in use warning
Tue, 13 Sep 2016 13:49:42 -0700 Martin von Zweigbergk rebase: make debug logging more consistent
Mon, 08 Aug 2016 22:06:07 -0700 Gregory Szorc changegroup: move branch cache debug message to proper location
Mon, 18 Jul 2016 22:25:09 +0200 Mads Kiilerich rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount stable
Sun, 17 Jul 2016 15:13:51 -0700 Gregory Szorc bundle2: store changeset count when creating file bundles
Wed, 10 Feb 2016 09:06:08 -0800 Ryan McElroy merge: minimize conflicts when common base is not shown (issue4447)
Thu, 24 Dec 2015 20:41:40 +0000 timeless rebase: hook afterresolvedstates
Tue, 20 Oct 2015 03:14:36 +0200 Pierre-Yves David test: use generaldelta in 'test-rebase-conflict.t'
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Wed, 01 Jul 2015 16:33:31 -0500 Matt Mackall merge with stable
Mon, 29 Jun 2015 11:20:09 -0700 Pierre-Yves David changegroup: properly compute common base in changeggroupsubset (issue4736) stable
Sat, 09 May 2015 23:40:40 -0700 Pierre-Yves David progress: get the extremely verbose output out of default debug
Tue, 24 Feb 2015 18:43:31 -0800 Durham Goode revbranchcache: write cache even during read operations
Sat, 17 Jan 2015 22:01:14 -0200 Wagner Bruna messages: quote "hg help" hints consistently
Wed, 14 Jan 2015 01:15:26 +0100 Mads Kiilerich branchcache: add debug output whenever cache files use truncate
Fri, 09 Jan 2015 10:52:14 -0800 Durham Goode bundles: do not overwrite existing backup bundles (BC)
Fri, 18 Apr 2014 13:33:20 +0200 Mads Kiilerich localrepo: show headline notes in commitctx before showing filenames
Thu, 18 Dec 2014 12:22:43 -0800 Eric Sumner bundlerepo: retract phase boundary
Wed, 10 Dec 2014 06:20:35 +0100 Mads Kiilerich rebase: improve debug messages while processing the list of rebases
Tue, 09 Dec 2014 03:45:26 +0100 Mads Kiilerich rebase: show more useful status information while rebasing
Sun, 07 Dec 2014 20:04:45 +0100 Mads Kiilerich tests: make 'saved backup' globbing less narrow in rebase tests
Sat, 26 Jul 2014 03:32:49 +0200 Pierre-Yves David resolve: add parenthesis around "no more unresolved files" message stable
Tue, 22 Apr 2014 02:10:25 +0200 Mads Kiilerich merge: change debug logging - test output changes but no real changes
Fri, 09 May 2014 14:46:50 -0500 Matt Mackall resolve: simplify "finished" message
Fri, 18 Apr 2014 22:19:25 -0700 Gregory Szorc resolve: print message when no unresolved files remain (issue4214)
Sat, 15 Feb 2014 01:23:12 +0100 Mads Kiilerich rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr
Fri, 22 Nov 2013 19:14:17 +0100 Martin Geisler tests: don't load unnecessary graphlog extension
Wed, 30 Oct 2013 19:45:14 +0100 Pierre-Yves David rebase: fix selection of base used when rebasing merge (issue4041) stable
Fri, 08 Feb 2013 16:17:46 -0600 Augie Fackler dispatch: exit with status 1 for an InterventionRequired exception (bc)
Fri, 08 Feb 2013 16:27:59 -0600 Augie Fackler rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Mon, 11 Mar 2013 15:37:28 -0700 Durham Goode rebase: restore active bookmark after rebase --continue stable
Wed, 08 Aug 2012 18:10:16 +0200 Mads Kiilerich check-code: fix check for trailing whitespace on sh command lines
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Tue, 17 Jan 2012 09:12:14 +0100 Alain Leufroy rebase: fix phases movement
Tue, 27 Dec 2011 00:11:22 +0100 Pierre-Yves David phases: prevent rebase to rebase immutable changeset.
Wed, 16 Nov 2011 18:04:19 -0600 Matt Mackall merge: give a special message for internal:merge failure (issue3105)
Sun, 06 Mar 2011 15:21:50 +0100 Patrick Mezard Improve unresolved merge conflicts warning (issue2681) stable
Sat, 30 Oct 2010 16:58:15 -0500 Steve Borho rebase: improve resolve failure message stable
Fri, 08 Oct 2010 22:36:10 -0500 Mads Kiilerich tests: remove redundant globs
Fri, 01 Oct 2010 16:10:06 +0200 Adrian Buehlmann tests: unify test-rebase*
less more (0) tip