Mercurial > hg

log tests/test-graft.t @ 34756:3f3c6d12095d

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
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
Wed, 09 Sep 2015 21:07:38 -0400 Matt Harbison extdiff: add a --patch argument for diffing changeset deltas
Mon, 15 Jun 2015 16:50:31 -0400 Matt Harbison convert: update 'intermediate-source' in the destination's extras dictionary
Sat, 09 May 2015 23:40:40 -0700 Pierre-Yves David progress: get the extremely verbose output out of default debug
Sun, 05 Apr 2015 12:12:02 -0700 Durham Goode graft: record intermediate grafts in extras
Sun, 05 Apr 2015 11:55:38 -0700 Durham Goode graft: allow creating sibling grafts
Tue, 20 Jan 2015 15:05:44 -0800 Ryan McElroy commit: remove reverse search for copy source when not in parent (issue4476) stable
Sat, 17 Jan 2015 22:01:14 -0200 Wagner Bruna messages: quote "hg help" hints consistently
Fri, 09 Jan 2015 10:52:14 -0800 Durham Goode bundles: do not overwrite existing backup bundles (BC)
Fri, 18 Apr 2014 13:33:20 +0200 Mads Kiilerich localrepo: show headline notes in commitctx before showing filenames
Tue, 09 Dec 2014 14:45:12 -0500 Augie Fackler test-graft: use strip extension instead of mq extension
Tue, 09 Dec 2014 12:39:23 -0600 Matt Mackall graft: drop cset description from empty commit message
Tue, 09 Dec 2014 03:38:23 +0100 Mads Kiilerich graft: show hashes in user-facing messages
Tue, 09 Dec 2014 03:38:23 +0100 Mads Kiilerich graft: give helpful warning for empty grafts
Tue, 09 Dec 2014 03:38:23 +0100 Mads Kiilerich graft: show more useful status information while grafting
Tue, 09 Dec 2014 03:37:55 +0100 Mads Kiilerich tests: test coverage for empty graft
Wed, 03 Dec 2014 14:03:20 -0800 Martin von Zweigbergk merge: make 'keep' message more descriptive
Wed, 03 Dec 2014 15:03:29 -0800 Martin von Zweigbergk graft: use a real conflict for the tests
Mon, 03 Nov 2014 12:08:03 -0500 Matt Harbison templater: don't overwrite the keyword mapping in runsymbol() (issue4362) stable
Sat, 11 Oct 2014 14:05:09 -0500 Matt Mackall dirstate: merge falls through to otherparent
Wed, 27 Aug 2014 18:35:34 +0200 Matt Mackall merge with stable
Wed, 27 Aug 2014 15:30:09 +0200 Mads Kiilerich graft: fix collision detection with origin revisions that are missing stable
Sat, 26 Jul 2014 14:54:36 -0700 Siddharth Agarwal graft: make --force apply across continues (issue3220)
Fri, 25 Jul 2014 18:21:16 -0700 Siddharth Agarwal graft: allow regrafting ancestors with --force (issue3220)
Sat, 26 Jul 2014 03:32:49 +0200 Pierre-Yves David resolve: add parenthesis around "no more unresolved files" message stable
Wed, 11 Jun 2014 22:19:29 -0400 Matt Harbison convert: update the transplant, rebase and graft references in 'extra'
Sun, 11 May 2014 00:49:36 +0900 FUJIWARA Katsunori graft: use "getcommiteditor()" instead of explicit editor choice
less more | (0) -100 -60 tip