| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
file |
diff |
annotate
|
| Tue, 25 Oct 2016 21:01:53 +0200 |
Gábor Stefanik |
merge: avoid superfluous filemerges when grafting through renames (issue5407)
stable
|
file |
diff |
annotate
|
| Tue, 11 Oct 2016 04:39:47 +0200 |
Gábor Stefanik |
copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
|
file |
diff |
annotate
|
| Wed, 12 Oct 2016 11:54:03 +0200 |
Gábor Stefanik |
checkcopies: handle divergences contained entirely in tca::ctx
|
file |
diff |
annotate
|
| Thu, 13 Oct 2016 02:19:43 +0200 |
Gábor Stefanik |
mergecopies: invoke _computenonoverlap for both base and tca during merges
|
file |
diff |
annotate
|
| Wed, 12 Oct 2016 12:41:28 +0200 |
Gábor Stefanik |
tests: introduce tests for grafting through renames
|
file |
diff |
annotate
|
| Wed, 12 Oct 2016 21:33:45 +0200 |
Gábor Stefanik |
checkcopies: add a sanity check against false-positive copies
|
file |
diff |
annotate
|
| Tue, 20 Sep 2016 23:48:08 +0000 |
timeless |
localrepo: use single quotes in use warning
|
file |
diff |
annotate
|
| Thu, 14 Apr 2016 15:19:57 +0000 |
timeless |
graft: use single quotes around command hint
|
file |
diff |
annotate
|
| Sat, 19 Mar 2016 18:37:10 -0700 |
Simon Farnsworth |
merge: save merge part labels for later reuse
|
file |
diff |
annotate
|
| Mon, 29 Feb 2016 01:01:20 -0500 |
Matt Harbison |
tests: flag Windows specific lines about background closing as optional
|
file |
diff |
annotate
|
| Thu, 04 Feb 2016 03:45:44 +0000 |
timeless |
graft: suggest the correct tool to continue (not graft)
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 18:29:17 +0900 |
FUJIWARA Katsunori |
tests: use portable diff script via extdiff extension
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 18:29:17 +0900 |
FUJIWARA Katsunori |
tests: make timezone in diff output glob-ed for portability
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 18:29:17 +0900 |
FUJIWARA Katsunori |
tests: omit -p for external diff via extdiff extension for portability
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 10:22:14 -0800 |
Durham Goode |
merge: add file ancestor linknode to mergestate
|
file |
diff |
annotate
|
| Sun, 17 Jan 2016 19:33:02 +0100 |
Mads Kiilerich |
graft: warn when -r is combined with revisions as positional arguments
|
file |
diff |
annotate
|
| Thu, 24 Dec 2015 20:46:06 +0000 |
timeless |
graft: hook afterresolvedstates
|
file |
diff |
annotate
|
| Wed, 02 Dec 2015 06:33:52 +0000 |
timeless |
graft: improve --continue abort message
|
file |
diff |
annotate
|
| Wed, 02 Dec 2015 06:31:12 +0000 |
timeless |
summary: mention graft
|
file |
diff |
annotate
|
| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
file |
diff |
annotate
|
| Wed, 09 Sep 2015 22:27:48 -0400 |
Matt Harbison |
extdiff: enable -I/-X with --patch
|
file |
diff |
annotate
|
| Wed, 09 Sep 2015 21:07:38 -0400 |
Matt Harbison |
extdiff: add a --patch argument for diffing changeset deltas
|
file |
diff |
annotate
|
| Mon, 15 Jun 2015 16:50:31 -0400 |
Matt Harbison |
convert: update 'intermediate-source' in the destination's extras dictionary
|
file |
diff |
annotate
|
| Sat, 09 May 2015 23:40:40 -0700 |
Pierre-Yves David |
progress: get the extremely verbose output out of default debug
|
file |
diff |
annotate
|
| Sun, 05 Apr 2015 12:12:02 -0700 |
Durham Goode |
graft: record intermediate grafts in extras
|
file |
diff |
annotate
|
| Sun, 05 Apr 2015 11:55:38 -0700 |
Durham Goode |
graft: allow creating sibling grafts
|
file |
diff |
annotate
|
| Tue, 20 Jan 2015 15:05:44 -0800 |
Ryan McElroy |
commit: remove reverse search for copy source when not in parent (issue4476)
stable
|
file |
diff |
annotate
|
| Sat, 17 Jan 2015 22:01:14 -0200 |
Wagner Bruna |
messages: quote "hg help" hints consistently
|
file |
diff |
annotate
|
| Fri, 09 Jan 2015 10:52:14 -0800 |
Durham Goode |
bundles: do not overwrite existing backup bundles (BC)
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 13:33:20 +0200 |
Mads Kiilerich |
localrepo: show headline notes in commitctx before showing filenames
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 14:45:12 -0500 |
Augie Fackler |
test-graft: use strip extension instead of mq extension
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 12:39:23 -0600 |
Matt Mackall |
graft: drop cset description from empty commit message
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 03:38:23 +0100 |
Mads Kiilerich |
graft: show hashes in user-facing messages
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 03:38:23 +0100 |
Mads Kiilerich |
graft: give helpful warning for empty grafts
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 03:38:23 +0100 |
Mads Kiilerich |
graft: show more useful status information while grafting
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 03:37:55 +0100 |
Mads Kiilerich |
tests: test coverage for empty graft
|
file |
diff |
annotate
|
| Wed, 03 Dec 2014 14:03:20 -0800 |
Martin von Zweigbergk |
merge: make 'keep' message more descriptive
|
file |
diff |
annotate
|
| Wed, 03 Dec 2014 15:03:29 -0800 |
Martin von Zweigbergk |
graft: use a real conflict for the tests
|
file |
diff |
annotate
|
| Mon, 03 Nov 2014 12:08:03 -0500 |
Matt Harbison |
templater: don't overwrite the keyword mapping in runsymbol() (issue4362)
stable
|
file |
diff |
annotate
|
| Sat, 11 Oct 2014 14:05:09 -0500 |
Matt Mackall |
dirstate: merge falls through to otherparent
|
file |
diff |
annotate
|
| Wed, 27 Aug 2014 18:35:34 +0200 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Wed, 27 Aug 2014 15:30:09 +0200 |
Mads Kiilerich |
graft: fix collision detection with origin revisions that are missing
stable
|
file |
diff |
annotate
|
| Sat, 26 Jul 2014 14:54:36 -0700 |
Siddharth Agarwal |
graft: make --force apply across continues (issue3220)
|
file |
diff |
annotate
|
| Fri, 25 Jul 2014 18:21:16 -0700 |
Siddharth Agarwal |
graft: allow regrafting ancestors with --force (issue3220)
|
file |
diff |
annotate
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
file |
diff |
annotate
|
| Wed, 11 Jun 2014 22:19:29 -0400 |
Matt Harbison |
convert: update the transplant, rebase and graft references in 'extra'
|
file |
diff |
annotate
|
| Sun, 11 May 2014 00:49:36 +0900 |
FUJIWARA Katsunori |
graft: use "getcommiteditor()" instead of explicit editor choice
|
file |
diff |
annotate
|
| Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
file |
diff |
annotate
|
| Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: change priority / ordering of merge actions
|
file |
diff |
annotate
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
file |
diff |
annotate
|
| Mon, 28 Apr 2014 17:25:36 -0700 |
Pierre-Yves David |
graft: do not use `.remove` on a smart set (regression)
stable
|
file |
diff |
annotate
|
| Mon, 07 Apr 2014 02:12:28 +0200 |
Mads Kiilerich |
merge: let manifestmerge emit 'keep' actions when keeping wd version
|
file |
diff |
annotate
|
| Sun, 02 Mar 2014 18:52:16 +0100 |
Mads Kiilerich |
merge: keep destination filename as key in filemerge actions
|
file |
diff |
annotate
|
| Fri, 22 Nov 2013 19:14:17 +0100 |
Martin Geisler |
tests: don't load unnecessary graphlog extension
|
file |
diff |
annotate
|