| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
changeset |
files
|
| Sun, 11 Oct 2015 20:12:12 -0700 |
Siddharth Agarwal |
merge: introduce a preresolve function
|
changeset |
files
|
| Sun, 11 Oct 2015 18:37:54 -0700 |
Siddharth Agarwal |
merge.mergestate._resolve: also return completed status
|
changeset |
files
|
| Sun, 11 Oct 2015 18:29:50 -0700 |
Siddharth Agarwal |
merge.mergestate: add a wrapper around resolve
|
changeset |
files
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
changeset |
files
|
| Sun, 11 Oct 2015 15:04:00 -0700 |
Siddharth Agarwal |
filemerge: clean up some dead code
|
changeset |
files
|
| Mon, 12 Oct 2015 14:15:04 -0400 |
Augie Fackler |
run-tests: add b-prefix on two strings to fix python3 support
|
changeset |
files
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
changeset |
files
|
| Sun, 11 Oct 2015 20:04:40 -0700 |
Siddharth Agarwal |
filemerge: only copy to backup during premerge step
|
changeset |
files
|
| Sun, 11 Oct 2015 20:02:53 -0700 |
Siddharth Agarwal |
filemerge: only print out "merging f" output at premerge step
|
changeset |
files
|
| Thu, 08 Oct 2015 00:19:20 -0700 |
Siddharth Agarwal |
filemerge: deindent the parts of filemerge outside the try block
|
changeset |
files
|
| Sun, 11 Oct 2015 20:47:04 -0700 |
Siddharth Agarwal |
filemerge: introduce a premerge flag and function
|
changeset |
files
|
| Sun, 11 Oct 2015 12:56:21 -0700 |
Siddharth Agarwal |
filemerge: also return whether the merge is complete
|
changeset |
files
|
| Sun, 11 Oct 2015 12:31:08 -0700 |
Siddharth Agarwal |
filemerge: add a wrapper around the filemerge function
|
changeset |
files
|
| Fri, 09 Oct 2015 01:19:37 +0200 |
Mads Kiilerich |
context: don't hex encode all unknown 20 char revision specs (issue4890)
|
changeset |
files
|
| Mon, 12 Oct 2015 00:45:24 -0700 |
Pierre-Yves David |
discovery: put trivial branch first
|
changeset |
files
|
| Fri, 09 Oct 2015 15:31:50 -0700 |
Pierre-Yves David |
shelve: rename 'publicancestors' to something accurate (issue4737)
|
changeset |
files
|
| Fri, 09 Oct 2015 12:30:46 -0500 |
Nathan Goldbaum |
makefile: add wheel build target
|
changeset |
files
|
| Fri, 09 Oct 2015 12:25:51 -0500 |
Nathan Goldbaum |
setup: import setup from setuptools if FORCE_SETUPTOOLS is set
|
changeset |
files
|
| Mon, 12 Oct 2015 14:46:51 +0100 |
Gijs Kruitbosch |
hgweb: remove obsolete -webkit-border-radius property
|
changeset |
files
|
| Mon, 12 Oct 2015 15:20:04 +0800 |
Anton Shestakov |
monoblue: add a link to the latest file revision
|
changeset |
files
|
| Fri, 09 Oct 2015 15:44:00 -0700 |
Pierre-Yves David |
discovery: reference relevant bug in the faulty code
|
changeset |
files
|
| Fri, 09 Oct 2015 15:37:05 -0700 |
Pierre-Yves David |
discovery: fix a typo in a comment
|
changeset |
files
|
| Fri, 09 Oct 2015 14:59:37 -0700 |
Pierre-Yves David |
getsubset: get the unpacker version from the bundler
|
changeset |
files
|
| Mon, 12 Oct 2015 15:42:32 +0300 |
Emanuele Giaquinta |
test-convert-cvs: add sleep so cvs notices changes
|
changeset |
files
|
| Wed, 07 Oct 2015 11:33:52 +0300 |
Emanuele Giaquinta |
cvsps: fix computation of parent revisions when log caching is on
|
changeset |
files
|
| Tue, 06 Oct 2015 16:26:20 -0500 |
Matt Mackall |
dirstate: batch calls to statfiles (issue4878)
|
changeset |
files
|
| Sun, 11 Oct 2015 18:30:47 +0900 |
Yuya Nishihara |
parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888)
|
changeset |
files
|
| Sun, 11 Oct 2015 18:41:41 +0900 |
Yuya Nishihara |
parsers: read sizes of metadata pair of obsolete marker at once
|
changeset |
files
|
| Wed, 07 Oct 2015 21:51:24 -0700 |
Siddharth Agarwal |
filemerge: clean up temp files in a finally block
|
changeset |
files
|