| Fri, 07 Jan 2022 11:53:23 +0300 |
Anton Shestakov |
branchmap: skip obsolete revisions while computing heads
|
| Tue, 23 Mar 2021 09:13:29 -0700 |
Martin von Zweigbergk |
tests: split up test-rebase-obsolete.t in four pieces
|
| Fri, 19 Mar 2021 12:08:46 -0700 |
Martin von Zweigbergk |
rebase: skip obsolete commits even if they have pruned successors
|
| Fri, 29 Jan 2021 16:33:12 -0800 |
Martin von Zweigbergk |
errors: use more specific errors in rebase extension
|
| Mon, 12 Oct 2020 12:44:18 -0700 |
Martin von Zweigbergk |
errors: introduce StateError and use it from commands and cmdutil
|
| Tue, 06 Oct 2020 22:36:15 -0700 |
Martin von Zweigbergk |
errors: introduce InputError 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
|
| Thu, 29 Oct 2020 09:03:08 -0700 |
Martin von Zweigbergk |
templates: include all non-branch namespaces in default one-line summary
|
| Tue, 27 Oct 2020 15:33:15 -0700 |
Martin von Zweigbergk |
rebase: change and standarize template for rebase's one-line summary
|
| Fri, 23 Oct 2020 10:56:18 -0700 |
Martin von Zweigbergk |
config: add a new [command-templates] section for templates defined by hg
|
| Mon, 14 Sep 2020 19:39:51 +0900 |
Yuya Nishihara |
merge with stable
|
| Fri, 04 Sep 2020 15:21:02 -0400 |
Matt Harbison |
repoview: pin revisions for `local` and `other` when a merge is active
stable
|
| Thu, 23 Jul 2020 13:31:45 -0700 |
Kyle Lippincott |
morestatus: mention --stop even if not using --verbose
|
| 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)
|
| Thu, 12 Dec 2019 23:03:52 -0800 |
Martin von Zweigbergk |
rebase: use cmdutil.check_incompatible_arguments() for --auto-orphans
|
| Fri, 13 Dec 2019 14:50:42 -0800 |
Martin von Zweigbergk |
rebase: use cmdutil.check_incompatible_arguments() for action+confirm/dryrun
|
| Thu, 12 Dec 2019 15:55:33 -0800 |
Martin von Zweigbergk |
rebase: use cmdutil.check_at_most_one_arg() for action
|
| Sun, 14 Oct 2018 13:19:24 +0200 |
Pierre-Yves David |
debugobsolete: also issue the "new obsmarkers" messsage
|
| Fri, 07 Dec 2018 14:23:17 -0800 |
Martin von Zweigbergk |
rebase: clarify that commits that become empty are skipped
|
| Fri, 07 Dec 2018 14:17:09 -0800 |
Martin von Zweigbergk |
rebase: format commit in usual way when explaining that it became empty
|
| Wed, 26 Sep 2018 23:50:14 +0200 |
Boris Feld |
obsolete: explicitly track folds inside the markers
|
| Thu, 30 Aug 2018 01:53:21 +0200 |
Boris Feld |
phase: report number of non-public changeset alongside the new range
|
| Thu, 12 Jul 2018 12:11:20 -0700 |
Martin von Zweigbergk |
rebase: skip extinct revisions even if it has no successor in rebase set
|
| Wed, 11 Jul 2018 12:26:44 -0700 |
Martin von Zweigbergk |
tests: add test showing that rebase of extinct commit with successor fails
|
| Mon, 27 Aug 2018 10:44:43 -0700 |
Martin von Zweigbergk |
tests: add log output after stripping for context for next test
|
| Wed, 15 Aug 2018 10:41:26 +0900 |
Yuya Nishihara |
rebase: consolidate check for --dry-run/--confirm on abort/stop/continue
|
| Wed, 15 Aug 2018 10:36:06 +0900 |
Yuya Nishihara |
rebase: consolidate check for --abort/--stop/--continue conflicts
|
| Fri, 27 Jul 2018 14:30:28 +0530 |
Sushil khanchi |
rebase: add test to show --stop moves bookmarks
|
| Sun, 22 Jul 2018 22:04:49 +0530 |
Sushil khanchi |
rebase: raise error for options conflicting with --stop
|
| Wed, 18 Jul 2018 00:25:52 +0530 |
Sushil khanchi |
rebase: add --stop option to stop rebase at any point (issue5206)
|
| Wed, 06 Jun 2018 13:31:24 -0400 |
Augie Fackler |
merge with stable
|
| Tue, 05 Jun 2018 23:49:54 -0400 |
Matt Harbison |
rebase: avoid RevlogError when computing obsoletenotrebased (issue5907)
stable
|
| Mon, 07 May 2018 19:43:43 -0700 |
Martin von Zweigbergk |
update: print warning about hidden changeset after update
|
| Sun, 04 Mar 2018 15:29:41 -0500 |
Augie Fackler |
rebase: introduce support for automatically rebasing orphan changes
|
| Fri, 09 Feb 2018 22:49:20 +0100 |
Denis Laxalde |
rebase: do not consider extincts for divergence detection (issue5782)
|
| Wed, 07 Feb 2018 12:06:13 +0100 |
Denis Laxalde |
rebase: add a test case for issue5782
|
| Sat, 20 Jan 2018 23:21:59 -0800 |
Martin von Zweigbergk |
repair: invalidate volatile sets after stripping
|
| Tue, 16 Jan 2018 14:28:57 +0100 |
Boris Feld |
bookmarks: display the obsfate of hidden revision we create a bookmark on
|
| Tue, 16 Jan 2018 14:08:54 +0100 |
Boris Feld |
update: display the obsfate of hidden revision we update to
|
| Sun, 14 Jan 2018 23:59:17 -0800 |
Martin von Zweigbergk |
evolution: report new unstable changesets
|
| Fri, 05 Jan 2018 22:28:06 +0530 |
Pulkit Goyal |
bookmarks: add bookmarks to hidden revs if directaccess config is set
|
| Wed, 27 Dec 2017 00:14:00 +0530 |
Pulkit Goyal |
update: support updating to hidden cset if directaccess config is set
|
| Fri, 22 Dec 2017 23:17:04 +0800 |
Anton Shestakov |
graphlog: add another graph node type, unstable, using character "*" (BC)
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
| Tue, 14 Nov 2017 22:46:10 +0100 |
Denis Laxalde |
rebase: exclude descendants of obsoletes w/o a successor in dest (issue5300)
|
| Sat, 11 Nov 2017 19:25:32 +0100 |
Denis Laxalde |
tests: add a couple of 'hg log' calls in test-rebase-obsolete.t
|
| Mon, 06 Nov 2017 22:08:02 +0100 |
Denis Laxalde |
tests: conditionally display obsfate in test-rebase-obsolete log output
|
| Sat, 11 Nov 2017 19:23:31 +0100 |
Denis Laxalde |
tests: clarify a comment in test-rebase-obsolete.t
|
| Wed, 01 Nov 2017 17:08:33 +0100 |
Boris Feld |
obsolete: activate effect-flag by default
|
| Tue, 17 Oct 2017 16:54:31 +0200 |
Boris Feld |
config: gather allowdivergence under the evolution namespace
|
| Tue, 17 Oct 2017 15:56:49 +0200 |
Boris Feld |
config: rename stabilization.track-operation
|
| Thu, 28 Sep 2017 18:56:40 +0100 |
Boris Feld |
config: use 'experimental.evolution.allowunstable'
|
| Thu, 28 Sep 2017 18:19:06 +0100 |
Boris Feld |
config: use 'experimental.evolution.create-markers'
|
| 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)
|
| Tue, 19 Sep 2017 22:06:26 -0700 |
Martin von Zweigbergk |
rebase: also include other namespaces in changeset description
|
| Fri, 15 Sep 2017 10:42:49 -0700 |
Martin von Zweigbergk |
obsmarker: track operation by default
|
| Wed, 06 Sep 2017 15:23:19 -0700 |
Jun Wu |
rebase: use unfiltered repo when loading state
|
| Wed, 06 Sep 2017 12:40:00 -0700 |
Jun Wu |
rebase: do not crash rebasing merge with a parent having hidden successor
|
| Fri, 01 Sep 2017 12:34:36 -0700 |
Saurabh Singh |
cmdutil: remove the redundant commit during amend
|
| Tue, 29 Aug 2017 17:51:54 -0700 |
Jun Wu |
rebase: use _ctxdesc in one more place
|
| Sun, 27 Aug 2017 02:47:47 -0700 |
Jun Wu |
rebase: move working parent and bookmark for obsoleted revs (BC)
|
| Thu, 10 Aug 2017 22:17:15 -0700 |
Jun Wu |
rebase: choose merge base without unwanted revisions
|
| Sat, 08 Jul 2017 20:38:34 -0700 |
Jun Wu |
rebase: remove messages for nullmerge and revignored (BC)
|
| Sat, 08 Jul 2017 20:38:34 -0700 |
Jun Wu |
rebase: remove revprecursor and revpruned states (BC)
|
| Sat, 08 Jul 2017 20:14:33 -0700 |
Jun Wu |
rebase: move obsoleted not rebased messages earlier (BC)
|
| Sat, 12 Aug 2017 21:01:06 -0700 |
Jun Wu |
rebase: change "result would have 3 parent" error message (BC)
|
| Thu, 10 Aug 2017 21:30:31 -0700 |
Jun Wu |
rebase: rewrite core algorithm (issue5578) (issue5630)
|
| Thu, 03 Aug 2017 14:01:51 +0200 |
Boris Feld |
revset: remane divergent into contentdivergent
|
| Fri, 04 Aug 2017 18:41:16 +0200 |
Boris Feld |
test: update evolution config
|
| Tue, 01 Aug 2017 17:58:20 +0200 |
Boris Feld |
evolution: rename divergent to content-divergent
|
| Fri, 14 Jul 2017 14:30:55 -0700 |
Martin von Zweigbergk |
tests: demonstrate crash when trying to rebase merge without its parents
|
| Sun, 16 Jul 2017 23:17:41 -0700 |
Martin von Zweigbergk |
tests: demonstrate broken rebase of merge with p1's successor in dest
|
| Tue, 01 Aug 2017 17:53:48 +0200 |
Boris Feld |
evolution: rename unstable to orphan
|
| Sun, 16 Jul 2017 02:33:14 +0200 |
Boris Feld |
debugobsolete: also report the number of obsoleted changesets
|
| Fri, 07 Jul 2017 18:51:46 -0700 |
Jun Wu |
rebase: use scmutil.cleanupnodes (issue5606) (BC)
|
| Mon, 22 May 2017 19:28:47 +0200 |
Boris Feld |
test: prepare tests for removing date aliases
|
| Sat, 20 May 2017 03:10:23 +0200 |
Pierre-Yves David |
obsmarker: add an experimental flag controlling "operation" recording
|
| Tue, 09 May 2017 16:29:31 -0700 |
Durham Goode |
obsolete: add operation metadata to rebase/amend/histedit obsmarkers
|
| Fri, 10 Mar 2017 23:07:20 -0800 |
Martin von Zweigbergk |
rebase: unhide original working directory node as well (issue5219)
|
| Wed, 01 Feb 2017 09:18:44 -0800 |
Martin von Zweigbergk |
tests: demonstrate broken rebase from obsolete commit
|
| Fri, 06 Jan 2017 14:35:22 +0100 |
Denis Laxalde |
summary: add evolution "troubles" information to summary output
|
| Sat, 17 Sep 2016 17:02:56 +1000 |
Xidorn Quan |
rebase: rebase changesets in topo order (issue5370) (BC)
|
| Fri, 17 Jun 2016 16:59:08 +0100 |
Kostia Balytskyi |
rebase: do not abort if all changesets have equivalents in the destination
|
| Mon, 11 Apr 2016 21:33:07 +0000 |
timeless |
rebase: handle successor targets (issue5198)
|
| Tue, 29 Mar 2016 11:50:41 -0700 |
Laurent Charignon |
rebase: fix crash when rebase aborts while rebasing obsolete revisions
|
| Wed, 09 Mar 2016 08:08:27 -0800 |
Kostia Balytskyi |
rebase: turn rebaseskipobsolete on by default
|
| Sat, 27 Feb 2016 18:02:12 +0100 |
Pierre-Yves David |
rebase: remove experimental option from 'rebase' config section
|
| Wed, 17 Feb 2016 20:31:34 +0000 |
Kostia Balytskyi |
rebase: add potential divergent commit hashes to error message (issue5086)
|
| Wed, 03 Feb 2016 09:06:52 -0800 |
Siddharth Agarwal |
graft: don't preserve most extra fields
stable
|
| Tue, 12 Jan 2016 13:43:41 -0800 |
Laurent Charignon |
rebase: prevent creating divergence
|
| Tue, 29 Dec 2015 15:32:12 -0800 |
Laurent Charignon |
rebase: better error message when rebased changes are all in destination
|
| Sat, 28 Nov 2015 04:11:38 -0500 |
Mike Edgar |
graft: copy extra (except branch) when copying changesets
|
| Wed, 18 Nov 2015 13:44:29 -0800 |
Laurent Charignon |
rebase: don't rebase obsolete commits with no successor
|
| Wed, 18 Nov 2015 13:46:42 -0800 |
Laurent Charignon |
rebase: fix a typo in test-rebase-obsolete
|
| Sun, 08 Nov 2015 17:56:48 -0500 |
Matt Harbison |
rebase: preserve the 'intermediate-source' attribute of grafts
|
| Mon, 19 Oct 2015 16:29:35 +0200 |
Mads Kiilerich |
rebase: fix wrong 'no changes to commit' when using --collapse
|
| Thu, 15 Oct 2015 00:32:20 +0100 |
Pierre-Yves David |
rebase: properly handle chains of markers with missing nodes
|
| Mon, 14 Sep 2015 17:31:48 -0700 |
Laurent Charignon |
rebase: don't rebase obsolete commit whose successor is already rebased
|
| Tue, 27 Jan 2015 12:33:56 +0000 |
Pierre-Yves David |
rebase: ensure rebase revision remains visible (issue4504)
stable
|
| Wed, 10 Dec 2014 06:20:35 +0100 |
Mads Kiilerich |
rebase: show warning when rebase creates no changes to commit
|
| Tue, 09 Dec 2014 03:45:26 +0100 |
Mads Kiilerich |
rebase: show more useful status information while rebasing
|
| Tue, 09 Dec 2014 03:38:23 +0100 |
Mads Kiilerich |
graft: show more useful status information while grafting
|
| Tue, 14 Oct 2014 13:34:25 -0700 |
Durham Goode |
obsolete: update tests to use obsolete options
|
| Mon, 18 Aug 2014 17:17:23 -0700 |
Pierre-Yves David |
debugobsolete: display parents information from markers
|
| Wed, 13 Aug 2014 23:42:36 -0700 |
Pierre-Yves David |
debugobsolete: explicitly display date in the output
|
| Mon, 14 Oct 2013 16:12:29 +0200 |
Pierre-Yves David |
rebase: preserve working directory parent (BC)
|
| Mon, 14 Oct 2013 16:49:54 +0200 |
Pierre-Yves David |
tests: prepare rebase test for wc parent preservation
|
| Tue, 01 Oct 2013 14:48:53 -0400 |
Augie Fackler |
rebase: preserve metadata from grafts of changes (issue4001)
|
| Sat, 19 Jan 2013 04:08:16 +0100 |
Pierre-Yves David |
test-rebase: add another test for rebase with multiple roots
stable
|
| Fri, 18 Jan 2013 23:41:48 +0100 |
Pierre-Yves David |
rebase: properly handle unrebased revision between rebased one
|
| Fri, 18 Jan 2013 14:15:32 +0100 |
Pierre-Yves David |
rebase: do not invent successor to skipped changeset
|
| Thu, 17 Jan 2013 00:35:01 +0100 |
Pierre-Yves David |
rebase: support multiple roots for rebaseset
|
| Wed, 16 Jan 2013 00:46:29 +0100 |
Pierre-Yves David |
test: fix in-test comments related to obsolescence
|
| Mon, 31 Dec 2012 17:45:52 -0600 |
Pierre-Yves David |
rebase: allow non-head rebase-set when obsolete is enabled
|
| Tue, 18 Sep 2012 23:32:42 +0200 |
Pierre-Yves David |
rebase: ensure rebase does not revive extinct revision
|
| Tue, 18 Sep 2012 23:42:27 +0200 |
Pierre-Yves David |
rebase: properly handle --collapse when creating obsolescence marker
|
| Tue, 18 Sep 2012 23:13:31 +0200 |
Pierre-Yves David |
rebase: allow creation obsolescence relation instead of stripping
|
