Mercurial > hg

log tests/test-rebase-inmemory.t @ 46180:b7ccdb52e0f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Sat, 26 Dec 2020 18:26:32 +0530 Sushil khanchi rebase: handle the case when nothing to rebase (dry-run)
Sat, 26 Dec 2020 18:04:30 +0530 Sushil khanchi rebase: add test to demonstrate an issue in dry-run
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:15:16 -0800 Martin von Zweigbergk tests: show that in-memory rebase leaves state when working copy is dirty 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
Wed, 02 Dec 2020 15:15:16 -0800 Martin von Zweigbergk tests: show that in-memory rebase leaves state when working copy is dirty
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
Tue, 27 Oct 2020 15:33:15 -0700 Martin von Zweigbergk rebase: change and standarize template for rebase's one-line summary
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
Fri, 18 Sep 2020 10:04:02 -0700 Martin von Zweigbergk rebase: fix an inconsistent hyphenation in a debug message
Fri, 31 Jul 2020 17:09:31 +0530 Pulkit Goyal merge stable in default
Tue, 28 Jul 2020 20:47:50 +0200 Manuel Jacob rebase: fix regression in file change detection introduced by 0ecb3b11fcad 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'
Sat, 11 Jul 2020 03:10:23 +0200 Manuel Jacob rebase: correctly check for empty commit in in-memory mode
Fri, 10 Jul 2020 01:36:19 +0200 Manuel Jacob rebase: add test case that shows that inmemory rebase does not preserve merges
Fri, 13 Dec 2019 14:50:42 -0800 Martin von Zweigbergk rebase: use cmdutil.check_incompatible_arguments() for action+confirm/dryrun
Wed, 06 Nov 2019 18:28:11 -0800 Kyle Lippincott rebase: check for unfinished ops even when inmemory (issue6214)
Wed, 21 Aug 2019 13:14:39 -0700 Martin von Zweigbergk merge: hint about using `hg resolve` for resolving conflicts
Tue, 02 Jul 2019 12:59:58 -0400 Valentin Gatien-Baron commit: improve the files field of changelog for merges
Mon, 24 Jun 2019 16:01:22 -0700 Martin von Zweigbergk rebase: fix in-memory rebasing of copy of empty file
Mon, 24 Jun 2019 16:07:59 -0700 Martin von Zweigbergk tests: demonstrate broken in-memory rebase of copy to empty file
Wed, 09 Jan 2019 15:54:45 -0800 Martin von Zweigbergk copies: fix duplicatecopies() with overlay context
Wed, 15 May 2019 16:10:52 -0700 Martin von Zweigbergk tests: demonstrate crash when rebasing across copy with --collapse
Fri, 10 May 2019 11:03:54 -0700 Martin von Zweigbergk overlaycontext: allow calling copydata() on clean context
Fri, 10 May 2019 10:23:08 -0700 Martin von Zweigbergk tests: demonstrate another failure with in-memory rebase and copies
Wed, 24 Apr 2019 19:42:43 +0300 Pulkit Goyal context: check file exists before getting data from _wrappedctx stable
Wed, 24 Apr 2019 19:28:46 +0300 Pulkit Goyal tests: show IMM is broken when merging file empty in destination stable
Wed, 10 Apr 2019 16:26:40 -0700 Martin von Zweigbergk messages: replace some instances of "folder" by "directory"
Thu, 14 Mar 2019 14:46:29 -0700 Martin von Zweigbergk rebase: fix crash with in-memory rebase and copies
Thu, 14 Mar 2019 13:53:20 -0700 Martin von Zweigbergk test: demonstrate crash with in-memory rebase and copies
Thu, 21 Feb 2019 19:11:28 -0800 Kyle Lippincott tests: change the paths slightly in test-rebase-inmemory.t
Tue, 04 Dec 2018 08:50:33 -0800 Martin von Zweigbergk tests: drop redundant "#if execbit" from test-rebase-inmemory.t
Tue, 20 Nov 2018 14:43:27 -0800 Martin von Zweigbergk rebase: fix path auditing to audit path relative to repo root (issue5818) stable 4.8.1
Tue, 04 Dec 2018 08:56:43 -0800 Martin von Zweigbergk tests: show bad path auditing in in-memory rebase stable
Tue, 04 Dec 2018 08:55:48 -0800 Martin von Zweigbergk tests: add a missing "cd .." to test-rebase-inmemory.t stable
Mon, 03 Dec 2018 11:14:44 -0800 Martin von Zweigbergk rebase: fix dir/file conflict detection when using in-mem merge stable
Mon, 03 Dec 2018 11:11:34 -0800 Martin von Zweigbergk tests: show that in-mem rebase does not find path dir/file conflicts stable
Mon, 03 Dec 2018 09:36:40 -0800 Martin von Zweigbergk rebase: abort in-mem rebase if there's a dirty merge state stable
Fri, 30 Nov 2018 16:21:37 -0800 Martin von Zweigbergk rebase: preserve working copy when redoing in-mem rebase on disk stable
Fri, 30 Nov 2018 15:08:43 -0800 Martin von Zweigbergk tests: show that in-mem rebase falling back loses state stable
Wed, 12 Sep 2018 17:45:43 +0300 Pulkit Goyal context: don't count deleted files as candidates for path conflicts in IMM
Wed, 12 Sep 2018 17:22:46 +0300 Pulkit Goyal rebase: add tests showing patch conflict detection needs to be smarter in IMM
Fri, 17 Aug 2018 10:21:25 +0900 Yuya Nishihara rebase: do not pass in user option to rollback in-memory merge conflict
Fri, 17 Aug 2018 10:19:17 +0900 Yuya Nishihara rebase: add test for in-memory merge conflicts
Thu, 16 Aug 2018 16:59:40 +0300 Pulkit Goyal context: make sure file is not deleted while checking path conflicts
Thu, 16 Aug 2018 16:53:48 +0300 Pulkit Goyal tests: demonstrate that IMM needs to be smarter with path conflicts
Thu, 16 Aug 2018 16:36:32 +0300 Pulkit Goyal tests: don't create new repo inside existing repo in test-rebase-inmemory.t
Wed, 15 Aug 2018 17:40:21 -0700 Kyle Lippincott overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)
Sat, 14 Jul 2018 08:59:42 +0530 Sushil khanchi rebase: in --confirm option just abort if hit a conflict
Thu, 12 Jul 2018 22:35:54 +0530 Sushil khanchi rebase: correct misleading message in --confirm option
Sat, 30 Jun 2018 12:42:49 +0530 Sushil khanchi rebase: add --confirm option
Fri, 29 Jun 2018 01:35:09 +0530 Sushil khanchi rebase: improve output of --dry-run
Fri, 29 Jun 2018 01:05:08 +0530 Sushil khanchi rebase: suppress warning thrown when aborting rebase in case of dryrun
Fri, 29 Jun 2018 00:47:33 +0530 Sushil khanchi rebase: no need to store backup in case of dryrun
Sat, 23 Jun 2018 08:59:18 +0530 Sushil khanchi rebase: make dry-run return 1 or 0 according to result
Sat, 16 Jun 2018 08:22:10 +0530 Sushil khanchi rebase: add dry-run functionality
Thu, 15 Mar 2018 13:19:55 -0700 Martin von Zweigbergk rebase: allow in-memory merge of the working copy parent
Mon, 11 Dec 2017 22:16:13 -0800 Phil Cohen rebase: replace --inmemory flag with rebase.experimental.inmemory config
Sun, 10 Dec 2017 22:39:46 -0800 Phil Cohen tests: add a simple test for in-memory rebase
less more | (0) tip