| Mon, 12 Oct 2015 20:13:12 +0200 |
Mads Kiilerich |
windows: read all global config files, not just the first (issue4491) (BC)
|
| Fri, 09 Oct 2015 14:48:59 -0700 |
Ryan McElroy |
strip: factor out revset calculation for strip -B
|
| Fri, 09 Oct 2015 11:22:01 -0700 |
Gregory Szorc |
clonebundles: support for seeding clones from pre-generated bundles
|
| Tue, 29 Sep 2015 16:17:32 -0700 |
Gregory Szorc |
sslutil: expose attribute indicating whether SNI is supported
|
| Sun, 11 Oct 2015 23:58:07 -0700 |
Siddharth Agarwal |
resolve: perform all premerges before performing any file merges (BC)
|
| 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
|
