Mercurial > hg

log tests/test-rebase-collapse.t @ 50400:95acba2c29f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
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
Tue, 04 May 2021 10:49:32 -0700 Martin von Zweigbergk rewriteutil: say how many commits would become orphan if commit is rewritten
Thu, 11 Feb 2021 15:11:10 -0800 Martin von Zweigbergk rewriteutil: point to help about instability when rewriting creates orphan
Fri, 29 Jan 2021 16:33:12 -0800 Martin von Zweigbergk errors: use more specific errors in rebase extension
Thu, 22 Oct 2020 14:14:59 -0700 Martin von Zweigbergk errors: introduce CanceledError and use it in a few places
Mon, 16 Nov 2020 15:11:51 -0800 Martin von Zweigbergk errors: raise more specific errors from rewriteutil
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
Thu, 10 Sep 2020 13:12:34 -0700 Martin von Zweigbergk graphlog: use '%' only if there are *unresolved* conflicts
Mon, 13 Jul 2020 16:42:44 -0700 Daniel Ploch error: unify the error message formats for 'rebase' and 'unshelve'
Thu, 12 Mar 2020 14:50:00 -0700 Martin von Zweigbergk tests: fix rebase test broken by earlier cleanup
Fri, 10 Jan 2020 14:22:20 -0800 Martin von Zweigbergk rebase: don't use rebased node as dirstate p2 (BC)
Tue, 28 Jan 2020 21:49:50 -0800 Martin von Zweigbergk graphlog: use '%' for other context in merge conflict
Tue, 21 Jan 2020 15:45:06 -0800 Martin von Zweigbergk tests: move non-collapse test out of test-rebase-collapse
Mon, 13 Jan 2020 11:18:29 -0800 Martin von Zweigbergk rebase: fix bug where `--collapse` would apply diff on missing file
Wed, 18 Dec 2019 09:18:02 +0300 Martin von Zweigbergk rebase: use rewriteutil.precheck() instead of reimplementing it
Thu, 10 Jan 2019 15:42:13 +0100 Boris Feld test: explicit a rebase source in test-rebase-collapse.t
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
Thu, 30 Aug 2018 01:53:21 +0200 Boris Feld phase: report number of non-public changeset alongside the new range
Wed, 21 Mar 2018 11:01:19 -0700 Martin von Zweigbergk rebase: store rebase state after each commit
Sun, 18 Mar 2018 22:26:23 -0700 Martin von Zweigbergk tests: add some more tests to test-rebase-collapse.t
Sun, 18 Mar 2018 15:25:23 -0700 Martin von Zweigbergk tests: use drawdag in test-rebase-collapse.t
Sun, 10 Dec 2017 22:50:57 -0500 Matt Harbison tests: remove (glob) annotations that were only for '\' matches
Sun, 10 Dec 2017 21:57:37 -0800 Phil Cohen tests: add commit hashes to log commands in rebase tests
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, 07 Jul 2017 18:51:46 -0700 Jun Wu rebase: use scmutil.cleanupnodes (issue5606) (BC)
Tue, 27 Jun 2017 17:39:55 +0200 Pierre-Yves David rebase: backed out changeset 2519994d25ca stable
Sun, 19 Mar 2017 11:54:15 -0700 Durham Goode rebase: use one dirstateguard for entire rebase
Sat, 19 Nov 2016 15:41:37 -0800 Kostia Balytskyi conflicts: make spacing consistent in conflict markers
Wed, 17 Feb 2016 22:45:01 +0100 liscju rebase: adds storing collapse message (issue4792)
Mon, 08 Feb 2016 14:03:45 +0100 Pierre-Yves David tests: add an explicit destination in some rebase tests
Mon, 19 Oct 2015 16:29:35 +0200 Mads Kiilerich rebase: fix wrong 'no changes to commit' when using --collapse
Fri, 22 May 2015 17:08:59 -0500 Matt Mackall branch: don't warn about branches if repository has multiple branches already
Fri, 09 Jan 2015 10:52:14 -0800 Durham Goode bundles: do not overwrite existing backup bundles (BC)
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
Sun, 07 Dec 2014 20:04:45 +0100 Mads Kiilerich tests: make 'saved backup' globbing less narrow in rebase tests
Fri, 10 Oct 2014 13:05:50 -0500 Matt Mackall dirstate: properly clean-up some more merge state on setparents
Fri, 15 Aug 2014 23:05:53 +0900 FUJIWARA Katsunori rebase: use "rebase.collapse" as "editform" for "--collapse" always
Sun, 02 Mar 2014 18:52:16 +0100 Mads Kiilerich merge: keep destination filename as key in filemerge actions
Wed, 19 Mar 2014 01:07:41 +0900 FUJIWARA Katsunori rebase: use "commitforceeditor" instead of "ui.edit()" for "--collapse" stable
Mon, 16 Sep 2013 01:08:29 -0700 Brodie Rao branchmap: cache open/closed branch head information
Fri, 22 Nov 2013 19:14:17 +0100 Martin Geisler tests: don't load unnecessary graphlog extension
Fri, 01 Nov 2013 17:08:06 -0700 Durham Goode rebase: fix working copy location after a --collapse (issue4080) stable
Wed, 23 Oct 2013 23:42:13 +0800 Mads Kiilerich rebase: improve error message for more than one external parent stable
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
Fri, 15 Mar 2013 11:23:29 -0700 Durham Goode rebase: fix --collapse when a file was added then removed
Fri, 08 Feb 2013 22:54:17 +0100 Mads Kiilerich export: show 'Date' header in a format that also is readable for humans
Tue, 05 Feb 2013 16:22:53 -0800 Durham Goode bookmark: don't allow integers as bookmark/branch/tag names
Wed, 16 Jan 2013 00:09:26 +0100 Pierre-Yves David destroyed: drop complex branchcache rebuilt logic
Sun, 13 Jan 2013 01:39:16 -0600 Kevin Bullock filtering: rename filters to their antonyms
Mon, 07 Jan 2013 17:23:25 +0100 Pierre-Yves David branchmap: allow to use cache of subset
Fri, 22 Jun 2012 02:39:52 +0200 Mads Kiilerich tests: add missing 'backup bundle' path glob in test-rebase-collapse.t
Fri, 18 May 2012 12:45:47 -0700 Joshua Redstone strip: incrementally update the branchheads cache after a strip
Wed, 20 Jun 2012 20:08:57 +0200 Pierre-Yves David rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Sun, 13 May 2012 14:29:05 +0200 Patrick Mezard test-rebase-collapse: fix Windows path separator
Thu, 03 May 2012 15:14:58 +0200 Patrick Mezard rebase: allow collapsing branches in place (issue3111)
Sun, 29 Apr 2012 22:25:55 +0200 Patrick Mezard localrepo: add setparents() to adjust dirstate copies (issue3407) stable
Tue, 03 Apr 2012 19:06:35 +0200 Thomas Arendsen Hein tests: make tests work if directory contains special characters stable
Mon, 23 Jan 2012 12:26:01 -0600 Augie Fackler test-rebase-collapse: Add test for rebase regression introduced in 12309c09d19a stable
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.
Thu, 08 Dec 2011 14:32:44 -0600 Matt Mackall branch: warn on branching stable
Sat, 15 Oct 2011 19:07:51 +0200 Pierre-Yves David rebase: use revset as soon as possible in internal logic
Mon, 18 Jul 2011 22:58:21 +0200 Stefano Tortarolo rebase: block collapse with keepbranches on multiple named branches (issue2112) stable
Sat, 30 Apr 2011 17:38:06 +0200 Nicolas Dumazet tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Tue, 15 Mar 2011 18:33:36 +0100 Radomir Dopieralski rebase: add -m/--message to rebase --collapse (issue2389)
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-collapse@b223b1002ccf
less more | (0) tip