Mercurial > hg

log tests/test-graft.t @ 42168:341bddf88ac5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -60 tip
age author description
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
Mon, 15 Apr 2019 16:41:43 -0700 Martin von Zweigbergk copies: fix up "fullcopy" with missing entries from "copy"
Sat, 13 Apr 2019 00:24:17 -0700 Martin von Zweigbergk tests: add test for issue5343 (grafting with copies)
Fri, 12 Apr 2019 09:41:08 -0700 Martin von Zweigbergk copies: print list of divergent renames in sorted order
Wed, 03 Apr 2019 09:38:08 -0700 Martin von Zweigbergk tests: better document the graft copy case
Thu, 10 Jan 2019 21:57:21 +0900 Yuya Nishihara graft: abort if --date/user specified with --currentdate/currentuser (BC)
Wed, 21 Nov 2018 21:40:16 +0900 Yuya Nishihara merge with stable
Thu, 15 Nov 2018 22:59:38 +0900 Yuya Nishihara graft: do not try to skip rev derived from ancestor more than once (issue6024) stable
Sun, 14 Oct 2018 17:08:18 +0200 Mads Kiilerich graft: introduce --base option for using custom base revision while merging
Thu, 30 Aug 2018 01:53:21 +0200 Boris Feld phase: report number of non-public changeset alongside the new range
Sat, 18 Aug 2018 12:35:47 -0400 Matt Harbison test-graft: add a missing output line for Windows
Sat, 07 Jul 2018 22:40:39 +0900 Yuya Nishihara commit: try hard to reuse p1 manifest if nothing changed
Thu, 09 Aug 2018 13:13:09 +0300 Pulkit Goyal status: advertise --abort instead of 'update -C .' to abort graft
Tue, 26 Jun 2018 16:14:02 +0530 Sushil khanchi graft: add no-commit mode (issue5631)
Fri, 25 May 2018 18:16:38 +0530 Pulkit Goyal graft: introduce --abort flag to abort interrupted graft
Wed, 13 Jun 2018 22:50:32 +0530 Pulkit Goyal morestatus: remove some extra spaces
Fri, 15 Jun 2018 02:07:39 +0530 Pulkit Goyal cmdutil: say that `graft --stop` stops the graft instead of aborting
Mon, 28 May 2018 21:13:32 +0530 Pulkit Goyal graft: add a new `--stop` flag to stop interrupted graft
Sat, 26 May 2018 03:01:14 +0530 Pulkit Goyal graft: reuse the --log value passed initially in `hg graft --continue` (BC)
Sat, 26 May 2018 02:57:36 +0530 Pulkit Goyal graft: add test showing --continue not preserving --log passed earlier
Sat, 26 May 2018 02:11:09 +0530 Pulkit Goyal graft: drop --user and --date values info from hint in case of conflicts
Fri, 25 May 2018 17:21:01 +0530 Pulkit Goyal graft: reuse --user and --date values in `hg graft --continue` (BC)
Sat, 26 May 2018 01:52:42 +0530 Pulkit Goyal tests: add test showing --continue not preserving --date and --user flags
Wed, 28 Feb 2018 03:07:48 +0530 Pulkit Goyal graft: add test for reading old graftstate files with new mechanism
Sun, 10 Dec 2017 22:50:57 -0500 Matt Harbison tests: remove (glob) annotations that were only for '\' matches
Thu, 03 Aug 2017 05:12:35 +0530 Pulkit Goyal morestatus: move fb extension to core by plugging to `hg status --verbose`
Tue, 02 May 2017 22:27:44 +0200 Pierre-Yves David caches: move the 'updating the branch cache' message in 'updatecaches'
Fri, 12 May 2017 11:20:25 -0700 Martin von Zweigbergk merge with stable
Thu, 11 May 2017 17:18:40 +0200 Mads Kiilerich graft: fix graft across merges of duplicates of grafted changes stable
Tue, 09 May 2017 00:11:30 +0200 Mads Kiilerich graft: test coverage of grafts and how merges can break duplicate detection stable
Wed, 03 May 2017 10:43:59 -0700 Durham Goode rebase: use matcher to optimize manifestmerge
Wed, 15 Mar 2017 23:21:30 +0900 Yuya Nishihara templatekw: make join() escape values of extras (BC) (issue5504)
Mon, 05 Dec 2016 17:40:01 +0100 Gábor Stefanik graft: support grafting changes to new file in renamed directory (issue5436)
Sat, 19 Nov 2016 15:41:37 -0800 Kostia Balytskyi conflicts: make spacing consistent in conflict markers
Tue, 25 Oct 2016 21:01:53 +0200 Gábor Stefanik merge: avoid superfluous filemerges when grafting through renames (issue5407) stable
Tue, 11 Oct 2016 04:39:47 +0200 Gábor Stefanik copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Wed, 12 Oct 2016 11:54:03 +0200 Gábor Stefanik checkcopies: handle divergences contained entirely in tca::ctx
Thu, 13 Oct 2016 02:19:43 +0200 Gábor Stefanik mergecopies: invoke _computenonoverlap for both base and tca during merges
Wed, 12 Oct 2016 12:41:28 +0200 Gábor Stefanik tests: introduce tests for grafting through renames
Wed, 12 Oct 2016 21:33:45 +0200 Gábor Stefanik checkcopies: add a sanity check against false-positive copies
Tue, 20 Sep 2016 23:48:08 +0000 timeless localrepo: use single quotes in use warning
Thu, 14 Apr 2016 15:19:57 +0000 timeless graft: use single quotes around command hint
Sat, 19 Mar 2016 18:37:10 -0700 Simon Farnsworth merge: save merge part labels for later reuse
Mon, 29 Feb 2016 01:01:20 -0500 Matt Harbison tests: flag Windows specific lines about background closing as optional
Thu, 04 Feb 2016 03:45:44 +0000 timeless graft: suggest the correct tool to continue (not graft)
Mon, 08 Feb 2016 18:29:17 +0900 FUJIWARA Katsunori tests: use portable diff script via extdiff extension
Mon, 08 Feb 2016 18:29:17 +0900 FUJIWARA Katsunori tests: make timezone in diff output glob-ed for portability
Mon, 08 Feb 2016 18:29:17 +0900 FUJIWARA Katsunori tests: omit -p for external diff via extdiff extension for portability
Fri, 05 Feb 2016 10:22:14 -0800 Durham Goode merge: add file ancestor linknode to mergestate
Sun, 17 Jan 2016 19:33:02 +0100 Mads Kiilerich graft: warn when -r is combined with revisions as positional arguments
Thu, 24 Dec 2015 20:46:06 +0000 timeless graft: hook afterresolvedstates
Wed, 02 Dec 2015 06:33:52 +0000 timeless graft: improve --continue abort message
Wed, 02 Dec 2015 06:31:12 +0000 timeless summary: mention graft
Wed, 25 Nov 2015 14:25:26 -0800 Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict
Sun, 11 Oct 2015 21:56:39 -0700 Siddharth Agarwal merge.mergestate: perform all premerges before any merges (BC)
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Sun, 11 Oct 2015 20:47:14 -0700 Siddharth Agarwal filemerge: break overall filemerge into separate premerge and merge steps
Wed, 07 Oct 2015 00:01:16 -0700 Siddharth Agarwal filemerge: normalize 'internal:foo' names to ':foo'
Wed, 09 Sep 2015 22:27:48 -0400 Matt Harbison extdiff: enable -I/-X with --patch
less more | (0) -100 -60 tip