Mercurial > hg-stable
graph
-
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
-
makefile: add wheel build targetFri, 09 Oct 2015 12:30:46 -0500, by Nathan Goldbaum
-
setup: import setup from setuptools if FORCE_SETUPTOOLS is setFri, 09 Oct 2015 12:25:51 -0500, by Nathan Goldbaum
-
hgweb: remove obsolete -webkit-border-radius propertyMon, 12 Oct 2015 14:46:51 +0100, by Gijs Kruitbosch
-
monoblue: add a link to the latest file revisionMon, 12 Oct 2015 15:20:04 +0800, by Anton Shestakov
-
discovery: reference relevant bug in the faulty codeFri, 09 Oct 2015 15:44:00 -0700, by Pierre-Yves David
-
discovery: fix a typo in a commentFri, 09 Oct 2015 15:37:05 -0700, by Pierre-Yves David
-
getsubset: get the unpacker version from the bundlerFri, 09 Oct 2015 14:59:37 -0700, by Pierre-Yves David
-
test-convert-cvs: add sleep so cvs notices changesMon, 12 Oct 2015 15:42:32 +0300, by Emanuele Giaquinta
-
cvsps: fix computation of parent revisions when log caching is onWed, 07 Oct 2015 11:33:52 +0300, by Emanuele Giaquinta
-
dirstate: batch calls to statfiles (issue4878)Tue, 06 Oct 2015 16:26:20 -0500, by Matt Mackall
-
parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888)Sun, 11 Oct 2015 18:30:47 +0900, by Yuya Nishihara
-
parsers: read sizes of metadata pair of obsolete marker at onceSun, 11 Oct 2015 18:41:41 +0900, by Yuya Nishihara
-
filemerge: clean up temp files in a finally blockWed, 07 Oct 2015 21:51:24 -0700, by Siddharth Agarwal
-
check-code: detect and ban 'util.Abort'Thu, 08 Oct 2015 12:53:09 -0700, by Pierre-Yves David
-
error: get Abort from 'error' instead of 'util'Thu, 08 Oct 2015 12:55:45 -0700, by Pierre-Yves David
-
eol: rename 'error' to 'haserror'Mon, 05 Oct 2015 22:49:24 -0700, by Pierre-Yves David
-
discovery: rename 'error' to 'errormsg'Mon, 05 Oct 2015 22:29:57 -0700, by Pierre-Yves David
-
histedit: delete histedit statefile on any exception during abortMon, 05 Oct 2015 16:44:45 -0700, by Christian Delahousse
-
histedit: check presence of statefile before deleting itTue, 06 Oct 2015 15:09:28 -0700, by Christian Delahousse
-
histedit: add inprogress method to state classMon, 05 Oct 2015 16:34:17 -0700, by Christian Delahousse
-
commands: use dirstateguard instead of begin/end-parentchange for backoutFri, 09 Oct 2015 03:53:47 +0900, by FUJIWARA Katsunori
-
commands: make "hg import" use dirstateguard only for --no-commitFri, 09 Oct 2015 03:53:47 +0900, by FUJIWARA Katsunori
-
cmdutil: stop tryimportone from using dirstateguard (BC)Fri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
-
dirstate: remove meaningless dirstateguardFri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
-
localrepo: execute appropriate actions for dirstate at releasing transactionFri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
-
transaction: add releasefn to notify the end of a transaction scopeFri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
-
filemerge: move post-merge checks into a separate functionWed, 07 Oct 2015 23:35:30 -0700, by Siddharth Agarwal
-
filemerge._xmerge: drop no longer necessary 'if r:' checkThu, 08 Oct 2015 14:18:43 -0700, by Siddharth Agarwal
-
filemerge._idump: drop no longer necessary 'if r:' checkThu, 08 Oct 2015 14:17:31 -0700, by Siddharth Agarwal
-
filemerge._merge: drop no longer necessary 'if r:' checkThu, 08 Oct 2015 14:16:19 -0700, by Siddharth Agarwal
-
revset: delete _updatedefaultdest as it has no usersMon, 05 Oct 2015 02:33:45 -0700, by Pierre-Yves David
-
merge: get the default update destination from the functionMon, 28 Sep 2015 22:11:23 -0700, by Pierre-Yves David
-
update: move default destination computation to a functionMon, 05 Oct 2015 01:46:47 -0700, by Pierre-Yves David
-
worker: restore old countcpus code (issue4869)Thu, 08 Oct 2015 10:57:03 -0700, by Gregory Szorc
-
filemerge: call premerge directly from main merge functionWed, 07 Oct 2015 21:22:16 -0700, by Siddharth Agarwal
-
bundle2: allow lazily acquiring the lockMon, 05 Oct 2015 16:19:54 -0700, by Durham Goode
-
bundle2: add op.gettransaction() to handlers that need the lockTue, 06 Oct 2015 14:42:29 -0700, by Durham Goode
-
merge with stableThu, 08 Oct 2015 17:44:22 -0500, by Matt Mackall
-
patchbomb: add a 'bundletype' config under 'patchbomb'Thu, 01 Oct 2015 23:13:57 -0700, by Pierre-Yves David
-
import: allow processing of extra part header after importWed, 07 Oct 2015 13:05:25 -0700, by Pierre-Yves David
-
import: allow processing of extra part header during importTue, 06 Oct 2015 09:51:24 -0700, by Pierre-Yves David
-
extract: parse 'nodeid' using the generic mechanismTue, 06 Oct 2015 02:23:21 -0700, by Pierre-Yves David
-
extract: parse 'branch' using the generic mechanismTue, 06 Oct 2015 02:22:23 -0700, by Pierre-Yves David