log

age author description
Sun, 11 Oct 2015 23:56:44 -0700 Siddharth Agarwal test-resolve.t: add some tests for .orig file contents
Sun, 11 Oct 2015 23:54:40 -0700 Siddharth Agarwal test-resolve.t: add some output to show order of operations
Sun, 11 Oct 2015 21:56:39 -0700 Siddharth Agarwal merge.mergestate: perform all premerges before any merges (BC)
Sun, 11 Oct 2015 20:12:12 -0700 Siddharth Agarwal merge: introduce a preresolve function
Sun, 11 Oct 2015 18:37:54 -0700 Siddharth Agarwal merge.mergestate._resolve: also return completed status
Sun, 11 Oct 2015 18:29:50 -0700 Siddharth Agarwal merge.mergestate: add a wrapper around resolve
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Sun, 11 Oct 2015 15:04:00 -0700 Siddharth Agarwal filemerge: clean up some dead code
Mon, 12 Oct 2015 14:15:04 -0400 Augie Fackler run-tests: add b-prefix on two strings to fix python3 support
Sun, 11 Oct 2015 20:47:14 -0700 Siddharth Agarwal filemerge: break overall filemerge into separate premerge and merge steps
Sun, 11 Oct 2015 20:04:40 -0700 Siddharth Agarwal filemerge: only copy to backup during premerge step
Sun, 11 Oct 2015 20:02:53 -0700 Siddharth Agarwal filemerge: only print out "merging f" output at premerge step
Thu, 08 Oct 2015 00:19:20 -0700 Siddharth Agarwal filemerge: deindent the parts of filemerge outside the try block
Sun, 11 Oct 2015 20:47:04 -0700 Siddharth Agarwal filemerge: introduce a premerge flag and function
Sun, 11 Oct 2015 12:56:21 -0700 Siddharth Agarwal filemerge: also return whether the merge is complete
Sun, 11 Oct 2015 12:31:08 -0700 Siddharth Agarwal filemerge: add a wrapper around the filemerge function
Fri, 09 Oct 2015 01:19:37 +0200 Mads Kiilerich context: don't hex encode all unknown 20 char revision specs (issue4890)
Mon, 12 Oct 2015 00:45:24 -0700 Pierre-Yves David discovery: put trivial branch first
Fri, 09 Oct 2015 15:31:50 -0700 Pierre-Yves David shelve: rename 'publicancestors' to something accurate (issue4737)
Fri, 09 Oct 2015 12:30:46 -0500 Nathan Goldbaum makefile: add wheel build target
Fri, 09 Oct 2015 12:25:51 -0500 Nathan Goldbaum setup: import setup from setuptools if FORCE_SETUPTOOLS is set
Mon, 12 Oct 2015 14:46:51 +0100 Gijs Kruitbosch hgweb: remove obsolete -webkit-border-radius property
Mon, 12 Oct 2015 15:20:04 +0800 Anton Shestakov monoblue: add a link to the latest file revision
Fri, 09 Oct 2015 15:44:00 -0700 Pierre-Yves David discovery: reference relevant bug in the faulty code
Fri, 09 Oct 2015 15:37:05 -0700 Pierre-Yves David discovery: fix a typo in a comment
Fri, 09 Oct 2015 14:59:37 -0700 Pierre-Yves David getsubset: get the unpacker version from the bundler
Mon, 12 Oct 2015 15:42:32 +0300 Emanuele Giaquinta test-convert-cvs: add sleep so cvs notices changes
Wed, 07 Oct 2015 11:33:52 +0300 Emanuele Giaquinta cvsps: fix computation of parent revisions when log caching is on
Tue, 06 Oct 2015 16:26:20 -0500 Matt Mackall dirstate: batch calls to statfiles (issue4878)
Sun, 11 Oct 2015 18:30:47 +0900 Yuya Nishihara parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888)
Sun, 11 Oct 2015 18:41:41 +0900 Yuya Nishihara parsers: read sizes of metadata pair of obsolete marker at once
Wed, 07 Oct 2015 21:51:24 -0700 Siddharth Agarwal filemerge: clean up temp files in a finally block
Thu, 08 Oct 2015 12:53:09 -0700 Pierre-Yves David check-code: detect and ban 'util.Abort'
Thu, 08 Oct 2015 12:55:45 -0700 Pierre-Yves David error: get Abort from 'error' instead of 'util'
Mon, 05 Oct 2015 22:49:24 -0700 Pierre-Yves David eol: rename 'error' to 'haserror'
Mon, 05 Oct 2015 22:29:57 -0700 Pierre-Yves David discovery: rename 'error' to 'errormsg'
Mon, 05 Oct 2015 16:44:45 -0700 Christian Delahousse histedit: delete histedit statefile on any exception during abort
Tue, 06 Oct 2015 15:09:28 -0700 Christian Delahousse histedit: check presence of statefile before deleting it
Mon, 05 Oct 2015 16:34:17 -0700 Christian Delahousse histedit: add inprogress method to state class
Fri, 09 Oct 2015 03:53:47 +0900 FUJIWARA Katsunori commands: use dirstateguard instead of begin/end-parentchange for backout
Fri, 09 Oct 2015 03:53:47 +0900 FUJIWARA Katsunori commands: make "hg import" use dirstateguard only for --no-commit
Fri, 09 Oct 2015 03:53:46 +0900 FUJIWARA Katsunori cmdutil: stop tryimportone from using dirstateguard (BC)
Fri, 09 Oct 2015 03:53:46 +0900 FUJIWARA Katsunori dirstate: remove meaningless dirstateguard
Fri, 09 Oct 2015 03:53:46 +0900 FUJIWARA Katsunori localrepo: execute appropriate actions for dirstate at releasing transaction
Fri, 09 Oct 2015 03:53:46 +0900 FUJIWARA Katsunori transaction: add releasefn to notify the end of a transaction scope
Wed, 07 Oct 2015 23:35:30 -0700 Siddharth Agarwal filemerge: move post-merge checks into a separate function
Thu, 08 Oct 2015 14:18:43 -0700 Siddharth Agarwal filemerge._xmerge: drop no longer necessary 'if r:' check
Thu, 08 Oct 2015 14:17:31 -0700 Siddharth Agarwal filemerge._idump: drop no longer necessary 'if r:' check
Thu, 08 Oct 2015 14:16:19 -0700 Siddharth Agarwal filemerge._merge: drop no longer necessary 'if r:' check
Mon, 05 Oct 2015 02:33:45 -0700 Pierre-Yves David revset: delete _updatedefaultdest as it has no users
Mon, 28 Sep 2015 22:11:23 -0700 Pierre-Yves David merge: get the default update destination from the function
Mon, 05 Oct 2015 01:46:47 -0700 Pierre-Yves David update: move default destination computation to a function
Thu, 08 Oct 2015 10:57:03 -0700 Gregory Szorc worker: restore old countcpus code (issue4869)
Wed, 07 Oct 2015 21:22:16 -0700 Siddharth Agarwal filemerge: call premerge directly from main merge function
Mon, 05 Oct 2015 16:19:54 -0700 Durham Goode bundle2: allow lazily acquiring the lock
Tue, 06 Oct 2015 14:42:29 -0700 Durham Goode bundle2: add op.gettransaction() to handlers that need the lock
Thu, 08 Oct 2015 17:44:22 -0500 Matt Mackall merge with stable
Thu, 01 Oct 2015 23:13:57 -0700 Pierre-Yves David patchbomb: add a 'bundletype' config under 'patchbomb'
Wed, 07 Oct 2015 13:05:25 -0700 Pierre-Yves David import: allow processing of extra part header after import
Tue, 06 Oct 2015 09:51:24 -0700 Pierre-Yves David import: allow processing of extra part header during import