Mercurial > hg

log tests/test-rebase-conflicts.t @ 51460:cebd96dee99a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Fri, 10 Mar 2023 04:04:10 +0100 Pierre-Yves David outgoing: fix common-heads computation from `missingroots` argument
Mon, 27 Feb 2023 23:04:09 -0500 Matt Harbison configitems: enable changegroup3 by default (unless using infinitepush)
Wed, 07 Dec 2022 20:12:23 +0100 Pierre-Yves David bundle: emit full snapshot as is, without doing a redelta
Tue, 18 Jan 2022 14:57:15 -0800 Martin von Zweigbergk rebase: set custom conflict label for base commit
Thu, 20 Jan 2022 14:13:12 -0800 Martin von Zweigbergk filemerge: always define a "base" label
Thu, 18 Mar 2021 18:24:59 -0400 Matt Harbison merge with stable
Thu, 04 Mar 2021 17:35:58 +0530 Pulkit Goyal commit: reorder if-else conditional to give mergestate info priority stable
Fri, 15 Jan 2021 01:58:59 +0100 Joerg Sonnenberger branchmap: update rev-branch-cache incrementally
Mon, 23 Nov 2020 16:48:13 -0800 Martin von Zweigbergk errors: raise StateError when there are unresolves merge conflicts
Mon, 12 Oct 2020 12:44:18 -0700 Martin von Zweigbergk errors: introduce StateError and use it from commands and cmdutil
Wed, 21 Oct 2020 19:00:16 -0700 Martin von Zweigbergk errors: add config that lets user get more detailed exit codes
Tue, 27 Oct 2020 15:33:15 -0700 Martin von Zweigbergk rebase: change and standarize template for rebase's one-line summary
Mon, 13 Jul 2020 16:42:44 -0700 Daniel Ploch error: unify the error message formats for 'rebase' and 'unshelve'
Fri, 10 Jan 2020 14:22:20 -0800 Martin von Zweigbergk rebase: don't use rebased node as dirstate p2 (BC)
Fri, 10 Jan 2020 17:46:10 -0800 Martin von Zweigbergk tests: add test of rebase with conflict in merge commit
Wed, 11 Sep 2019 15:03:08 -0700 Martin von Zweigbergk bundle2: fix an off-by-one in debug message of number of parts
Sun, 08 Sep 2019 09:42:53 +0200 Pierre-Yves David changegroup: move message about added changes to transaction summary
Sun, 14 Jul 2019 23:21:28 -0700 Martin von Zweigbergk py3: fix formatting of branchmap log messages with repo.filtername=None
Sun, 09 Jun 2019 02:12:58 +0530 Taapas Agrawal statecheck: added support for STATES
Fri, 12 Apr 2019 21:41:51 -0700 Martin von Zweigbergk copies: delete debug message about changes since common ancestor
Thu, 11 Apr 2019 23:28:38 -0700 Martin von Zweigbergk copies: delete debug message about search limit
Thu, 04 Apr 2019 13:58:49 +0200 Pierre-Yves David repoview: keep the branchmap cache for the `served.hidden` view warm
Thu, 30 Aug 2018 01:53:21 +0200 Boris Feld phase: report number of non-public changeset alongside the new range
Wed, 13 Jun 2018 22:50:32 +0530 Pulkit Goyal morestatus: remove some extra spaces
Tue, 08 May 2018 14:17:46 -0700 Boris Feld bundle2: mark the bundle2 part as advisory (issue5872) stable
Tue, 03 Apr 2018 13:56:09 -0700 Gregory Szorc tests: use `hg unbundle` instead of `hg pull` in some tests
Tue, 03 Apr 2018 18:20:10 -0700 Gregory Szorc tests: remove superfluous config setting
Wed, 21 Mar 2018 11:01:19 -0700 Martin von Zweigbergk rebase: store rebase state after each commit
Thu, 18 Jan 2018 15:10:22 +0100 Boris Feld revbranchcache: advertise and use 'rbc' exchange capability
Wed, 21 Feb 2018 17:33:00 +0100 Boris Feld bundle: include advisory rev branch cache part in bundle2 bundle
Sun, 10 Dec 2017 22:50:57 -0500 Matt Harbison tests: remove (glob) annotations that were only for '\' matches
Sun, 10 Dec 2017 22:39:46 -0800 Phil Cohen tests: add a simple test for in-memory rebase
Tue, 17 Oct 2017 11:29:26 +0200 Boris Feld config: replace experimental.stabilization by experimental.evolution
Thu, 12 Oct 2017 09:39:50 +0200 Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Sat, 08 Jul 2017 20:38:34 -0700 Jun Wu rebase: remove messages for nullmerge and revignored (BC)
Fri, 04 Aug 2017 18:41:16 +0200 Boris Feld test: update evolution config
Thu, 03 Aug 2017 05:12:35 +0530 Pulkit Goyal morestatus: move fb extension to core by plugging to `hg status --verbose`
Fri, 07 Jul 2017 18:51:46 -0700 Jun Wu rebase: use scmutil.cleanupnodes (issue5606) (BC)
Thu, 29 Jun 2017 15:21:52 -0700 Martin von Zweigbergk merge with stable
Tue, 27 Jun 2017 17:40:24 +0200 Pierre-Yves David rebase: backed out changeset cf8ad0e6c0e4 (issue5610) stable
Sat, 24 Jun 2017 10:31:41 -0700 Jun Wu test-rebase-conflicts: add a test case about turning obsstore on and off
Thu, 15 Jun 2017 00:15:52 -0700 Martin von Zweigbergk strip: include phases in bundle (BC)
Tue, 02 May 2017 18:57:52 +0200 Pierre-Yves David caches: stop warming the cache after changegroup application
Tue, 02 May 2017 22:27:44 +0200 Pierre-Yves David caches: move the 'updating the branch cache' message in 'updatecaches'
Thu, 11 May 2017 22:38:15 -0700 Martin von Zweigbergk rebase: rename "target" to "destination" in messages
Tue, 07 Mar 2017 16:27:32 -0800 Durham Goode rebase: move actual rebase into a single transaction
Tue, 07 Mar 2017 16:30:31 -0800 Durham Goode rebase: allow aborting if last-message.txt is missing
Sat, 19 Nov 2016 15:41:37 -0800 Kostia Balytskyi conflicts: make spacing consistent in conflict markers
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* base tests/test-rebase-conflicts@5dc62e6e2295
less more | (0) tip