Mercurial > hg

log hgext/rebase.py @ 46606:ced66295ea90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -60 tip
age author description
Thu, 28 May 2020 17:31:41 -0400 Augie Fackler rebase: add a config knob for forcing in-memory rebasing
Sat, 26 Dec 2020 18:26:32 +0530 Sushil khanchi rebase: handle the case when nothing to rebase (dry-run)
Tue, 01 Dec 2020 21:54:46 +0100 Joerg Sonnenberger node: import symbols explicitly
Thu, 03 Dec 2020 14:15:39 -0500 Augie Fackler merge with stable
Wed, 02 Dec 2020 15:39:01 -0800 Martin von Zweigbergk rebase: clear merge state when aborting in-memory merge on dirty working copy stable 5.6.1
Wed, 02 Dec 2020 15:39:01 -0800 Martin von Zweigbergk rebase: clear merge state when aborting in-memory merge on dirty working copy
Fri, 27 Nov 2020 17:03:29 -0500 Augie Fackler formating: upgrade to black 20.8b1
Tue, 13 Oct 2020 14:16:21 -0400 Matt Harbison rebase: update commit hash references in the new commits
Tue, 27 Oct 2020 15:33:15 -0700 Martin von Zweigbergk rebase: change and standarize template for rebase's one-line summary
Thu, 22 Oct 2020 23:10:06 -0700 Martin von Zweigbergk rebase: make summary template configurable, with default to shared template
Thu, 22 Oct 2020 22:29:22 -0700 Martin von Zweigbergk rebase: use hard-coded template for one-line commit description
Mon, 21 Sep 2020 11:53:44 -0700 Martin von Zweigbergk merge: replace calls to hg.updaterepo() by merge.update()
Mon, 21 Sep 2020 09:57:29 -0700 Martin von Zweigbergk merge: add a higher-level update() for the common `hg update` use case
Mon, 21 Sep 2020 11:12:58 -0700 Martin von Zweigbergk merge: make low-level update() private (API)
Mon, 21 Sep 2020 10:09:39 -0700 Martin von Zweigbergk merge: use merge.clean_update() when applicable
Fri, 18 Sep 2020 15:03:06 -0700 Martin von Zweigbergk rebase: teach in-memory rebase to not restart with on-disk rebase on conflict
Wed, 23 Sep 2020 09:04:32 -0700 Martin von Zweigbergk rebase: move check for unresolved conflicts into lower-level rebasenode()
Fri, 18 Sep 2020 15:40:26 -0700 Martin von Zweigbergk rebase: add dryrun property to rebaseruntime
Wed, 23 Sep 2020 09:21:26 -0700 Martin von Zweigbergk rebase: when collapsing, p1 == dest, so use the former only
Fri, 18 Sep 2020 15:37:03 -0700 Martin von Zweigbergk rebase: remove redundant isinmemory argument from _origrebase()
Fri, 18 Sep 2020 15:10:14 -0700 Martin von Zweigbergk rebase: stop clearing on-disk mergestate when running in memory
Fri, 18 Sep 2020 10:15:13 -0700 Martin von Zweigbergk rebase: delete unused p1 argument to _concludenode()
Fri, 18 Sep 2020 10:04:02 -0700 Martin von Zweigbergk rebase: fix an inconsistent hyphenation in a debug message
Tue, 28 Jul 2020 20:47:50 +0200 Manuel Jacob rebase: fix regression in file change detection introduced by 0ecb3b11fcad stable
Tue, 14 Jul 2020 13:35:54 -0700 Daniel Ploch error: normalize "unresolved conflicts" error messages with a custom class
Mon, 13 Jul 2020 16:42:44 -0700 Daniel Ploch error: unify the error message formats for 'rebase' and 'unshelve'
Mon, 01 Jun 2020 08:38:42 +0200 Manuel Jacob rebase: consider rewrite.empty-successor configuration
Sat, 11 Jul 2020 03:10:23 +0200 Manuel Jacob rebase: correctly check for empty commit in in-memory mode
Sat, 11 Jul 2020 00:53:34 +0200 Manuel Jacob overlayworkingctx: rename misleadingly named `isempty()` method
Thu, 09 Jul 2020 07:00:32 +0200 Manuel Jacob rebase: remove now unnecessary logic to allow empty commit when branch changes
Mon, 15 Jun 2020 12:00:15 -0400 Augie Fackler merge with stable
Thu, 30 Apr 2020 00:33:00 -0400 Matt Harbison rebase: avoid clobbering wdir() with --dry-run or --confirm (issue6291) stable
Mon, 18 May 2020 14:59:59 -0400 Augie Fackler mergestate: split out merge state handling code from main merge module
Wed, 01 Apr 2020 14:34:21 -0700 Martin von Zweigbergk rebase: don't create merge when continuing rebase interrupted by old hg
Fri, 13 Mar 2020 16:57:38 -0700 Martin von Zweigbergk rebase: accept multiple --base arguments (BC)
Fri, 13 Mar 2020 16:39:32 -0700 Martin von Zweigbergk rebase: accept multiple --source arguments (BC)
Fri, 13 Mar 2020 19:29:02 -0700 Martin von Zweigbergk rebase: mention -r argument in synopsis
Fri, 13 Mar 2020 16:36:31 -0700 Martin von Zweigbergk rebase: remove unused defaults argument values from _definedestmap()
Fri, 06 Mar 2020 13:27:41 -0500 Augie Fackler cleanup: run pyupgrade on our source tree to clean up varying things
Fri, 28 Feb 2020 11:32:27 -0800 Martin von Zweigbergk cleanup: remove redundant clearing of mergestate in rebase and shelve
Fri, 10 Jan 2020 17:20:12 -0800 Martin von Zweigbergk rebase: remove some now-unused parent arguments
Fri, 10 Jan 2020 21:40:01 -0800 Martin von Zweigbergk rebase: remove some redundant setting of dirstate parents
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 14:17:56 -0800 Martin von Zweigbergk rebase: stop relying on having two parents to resume rebase
Thu, 16 Jan 2020 00:03:19 -0800 Martin von Zweigbergk rebase: always be graft-like, not merge-like, also for merges
Wed, 15 Jan 2020 15:30:25 -0800 Martin von Zweigbergk merge: introduce a clean_update() for that use-case
Fri, 31 Jan 2020 10:53:50 -0800 Martin von Zweigbergk rebase: abort if the user tries to rebase the working copy
Wed, 15 Jan 2020 22:24:16 -0800 Martin von Zweigbergk rebase: define base in only place in defineparents()
Mon, 27 Jan 2020 09:14:19 -0800 Martin von Zweigbergk cmdutil: change check_incompatible_arguments() *arg to single iterable
Wed, 15 Jan 2020 17:15:45 -0800 Martin von Zweigbergk rebase: move some variables after an error cases where they're not needed
Wed, 15 Jan 2020 10:44:23 -0800 Martin von Zweigbergk rebase: clarify a little by calculating a set in Python instead of in revset
Mon, 13 Jan 2020 11:18:29 -0800 Martin von Zweigbergk rebase: fix bug where `--collapse` would apply diff on missing file
Mon, 13 Jan 2020 11:11:20 -0800 Martin von Zweigbergk rebase: extract a variable for a repeated `repo[p1]`
Fri, 27 Dec 2019 13:47:59 -0800 Martin von Zweigbergk graftcopies: remove `skip` and `repo` arguments
Mon, 06 Jan 2020 15:24:36 -0800 Martin von Zweigbergk copies: replace duplicatecopies() by function that takes contexts
Fri, 10 Jan 2020 15:47:39 -0800 Martin von Zweigbergk rebase: delete seemingly unnecessary needupdate()
Fri, 10 Jan 2020 21:41:28 -0800 Martin von Zweigbergk overlayworkginctx: implement a setparents() to mirror dirstate.setparents()
Fri, 10 Jan 2020 17:03:23 -0800 Martin von Zweigbergk overlayworkingctx: default branch to base context's branch
Fri, 27 Dec 2019 13:52:39 -0500 Matt Harbison rebase: drop an unused variable assignment
Wed, 18 Dec 2019 10:55:06 -0800 Martin von Zweigbergk rebase: restore i18n of a hint message
less more | (0) -300 -100 -60 tip