Mercurial > hg-stable
graph
-
merge: abort on file/directory case folding collisions (issue4892)Tue, 13 Oct 2015 00:16:25 +0200, by Mads Kiilerich
-
tests: test of case-folding merge collisionsTue, 13 Oct 2015 00:16:25 +0200, by Mads Kiilerich
-
copies: group bothnew with other setsWed, 19 Aug 2015 15:40:13 -0500, by Matt Mackall
-
copies: rename renamedelete to renamedeleteset for clarityWed, 19 Aug 2015 15:32:27 -0500, by Matt Mackall
-
copies: move _makegetfctx calls into checkcopiesWed, 19 Aug 2015 15:26:08 -0500, by Matt Mackall
-
copies: factor out setupctx into _makegetfctxWed, 19 Aug 2015 15:17:33 -0500, by Matt Mackall
-
copies: avoid reference to c1/c2 in makectxFri, 21 Aug 2015 15:12:58 -0500, by Matt Mackall
-
mq: use cmdutil.revert instead of hg.revertMon, 12 Oct 2015 03:37:09 -0500, by Matt Mackall
-
debugmergestate: add support for printing out driver-resolved filesWed, 30 Sep 2015 21:48:53 -0700, by Siddharth Agarwal
-
debugmergestate: add support for printing out merge driverWed, 30 Sep 2015 21:47:27 -0700, by Siddharth Agarwal
-
merge.mergedriver: don't try resolving files marked driver-resolvedWed, 30 Sep 2015 19:43:51 -0700, by Siddharth Agarwal
-
merge.mergestate: add support for persisting driver-resolved filesMon, 28 Sep 2015 18:34:06 -0700, by Siddharth Agarwal
-
merge.mergestate: add support for persisting a custom merge driverWed, 30 Sep 2015 21:42:52 -0700, by Siddharth Agarwal
-
exchange: support sorting URLs by client-side preferencesTue, 13 Oct 2015 12:30:39 -0700, by Gregory Szorc
-
exchange: extract bundle specification components into own attributesTue, 13 Oct 2015 12:31:19 -0700, by Gregory Szorc
-
exchange: support preserving external names when parsing bundle specsTue, 13 Oct 2015 12:29:50 -0700, by Gregory Szorc
-
clonebundles: filter on SNI requirementTue, 13 Oct 2015 10:59:41 -0700, by Gregory Szorc
-
clonebundles: filter on bundle specificationTue, 13 Oct 2015 11:45:30 -0700, by Gregory Szorc
-
clonebundle: support bundle2Tue, 13 Oct 2015 10:41:54 -0700, by Gregory Szorc
-
update: also use 'destupdate' for pull and unbundleMon, 05 Oct 2015 21:31:32 -0700, by Pierre-Yves David
-
destupdate: also include bookmark related logicTue, 29 Sep 2015 01:03:26 -0700, by Pierre-Yves David
-
exchange: refactor bundle specification parsingTue, 13 Oct 2015 10:57:54 -0700, by Gregory Szorc
-
exchange: move bundle specification parsing from cmdutilTue, 13 Oct 2015 11:43:21 -0700, by Gregory Szorc
-
revset: add optional offset argument to limit() predicateTue, 24 Mar 2015 00:28:28 +0900, by Yuya Nishihara
-
revset: port limit() to support keyword argumentsMon, 12 Oct 2015 17:19:22 +0900, by Yuya Nishihara
-
revset: eliminate temporary reference to subset in limit() and last()Mon, 12 Oct 2015 17:14:47 +0900, by Yuya Nishihara
-
dirstate: read from pending file under HG_PENDING mode if it existsWed, 14 Oct 2015 02:49:17 +0900, by FUJIWARA Katsunori
-
dirstate: make writing in-memory changes aware of transaction activityWed, 14 Oct 2015 02:49:17 +0900, by FUJIWARA Katsunori
-
dirstate: make functions for backup aware of transaction activityWed, 14 Oct 2015 02:49:17 +0900, by FUJIWARA Katsunori
-
dirstate: move code paths for backup from dirstateguard to dirstateWed, 14 Oct 2015 02:49:17 +0900, by FUJIWARA Katsunori
-
localrepo: restore dirstate to one before rollbacking if not parent-goneTue, 13 Oct 2015 12:25:43 -0700, by FUJIWARA Katsunori
-
parsers: make pack_dirstate take now in integer for consistencyWed, 14 Oct 2015 02:40:04 +0900, by FUJIWARA Katsunori
-
destupdate: include the 'check' logicTue, 29 Sep 2015 00:18:49 -0700, by Pierre-Yves David
-
destupdate: move the check related to the "clean" logic in the functionMon, 05 Oct 2015 03:50:47 -0700, by Pierre-Yves David
-
largefiles: better handling of merge of largefiles that not are availableMon, 12 Oct 2015 19:22:34 +0200, by Mads Kiilerich
-
patchbomb: check that targets exist at the publicurlSun, 11 Oct 2015 22:13:03 -0700, by Pierre-Yves David
-
windows: read all global config files, not just the first (issue4491) (BC)Mon, 12 Oct 2015 20:13:12 +0200, by Mads Kiilerich
-
strip: factor out revset calculation for strip -BFri, 09 Oct 2015 14:48:59 -0700, by Ryan McElroy
-
clonebundles: support for seeding clones from pre-generated bundlesFri, 09 Oct 2015 11:22:01 -0700, by Gregory Szorc
-
sslutil: expose attribute indicating whether SNI is supportedTue, 29 Sep 2015 16:17:32 -0700, by Gregory Szorc
-
resolve: perform all premerges before performing any file merges (BC)Sun, 11 Oct 2015 23:58:07 -0700, by Siddharth Agarwal
-
test-resolve.t: add some tests for .orig file contentsSun, 11 Oct 2015 23:56:44 -0700, by Siddharth Agarwal
-
test-resolve.t: add some output to show order of operationsSun, 11 Oct 2015 23:54:40 -0700, by Siddharth Agarwal
-
merge.mergestate: perform all premerges before any merges (BC)Sun, 11 Oct 2015 21:56:39 -0700, by Siddharth Agarwal
-
merge: introduce a preresolve functionSun, 11 Oct 2015 20:12:12 -0700, by Siddharth Agarwal
-
merge.mergestate._resolve: also return completed statusSun, 11 Oct 2015 18:37:54 -0700, by Siddharth Agarwal
-
merge.mergestate: add a wrapper around resolveSun, 11 Oct 2015 18:29:50 -0700, by Siddharth Agarwal
-
simplemerge: move conflict warning message to filemergeFri, 09 Oct 2015 13:54:52 -0700, by Siddharth Agarwal
-
filemerge: clean up some dead codeSun, 11 Oct 2015 15:04:00 -0700, by Siddharth Agarwal
-
run-tests: add b-prefix on two strings to fix python3 supportMon, 12 Oct 2015 14:15:04 -0400, by Augie Fackler
-
filemerge: break overall filemerge into separate premerge and merge stepsSun, 11 Oct 2015 20:47:14 -0700, by Siddharth Agarwal
-
filemerge: only copy to backup during premerge stepSun, 11 Oct 2015 20:04:40 -0700, by Siddharth Agarwal
-
filemerge: only print out "merging f" output at premerge stepSun, 11 Oct 2015 20:02:53 -0700, by Siddharth Agarwal
-
filemerge: deindent the parts of filemerge outside the try blockThu, 08 Oct 2015 00:19:20 -0700, by Siddharth Agarwal
-
filemerge: introduce a premerge flag and functionSun, 11 Oct 2015 20:47:04 -0700, by Siddharth Agarwal
-
filemerge: also return whether the merge is completeSun, 11 Oct 2015 12:56:21 -0700, by Siddharth Agarwal
-
filemerge: add a wrapper around the filemerge functionSun, 11 Oct 2015 12:31:08 -0700, by Siddharth Agarwal
-
context: don't hex encode all unknown 20 char revision specs (issue4890)Fri, 09 Oct 2015 01:19:37 +0200, by Mads Kiilerich
-
discovery: put trivial branch firstMon, 12 Oct 2015 00:45:24 -0700, by Pierre-Yves David
-
shelve: rename 'publicancestors' to something accurate (issue4737)Fri, 09 Oct 2015 15:31:50 -0700, by Pierre-Yves David