Mon, 19 May 2014 01:53:34 +0200 |
Mads Kiilerich |
update: introduce --tool for controlling the merge tool
|
changeset |
files
|
Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: fix stupid indentation left over from previous refactorings
|
changeset |
files
|
Mon, 26 May 2014 12:39:31 -0400 |
Augie Fackler |
Merge with stable
|
changeset |
files
|
Tue, 29 Apr 2014 14:12:32 -0700 |
Pierre-Yves David |
revsetbenchmark: support for running on other repo
|
changeset |
files
|
Tue, 29 Apr 2014 13:18:22 -0700 |
Pierre-Yves David |
revsetbenchmark: automatically finds the perf extension
|
changeset |
files
|
Thu, 15 May 2014 23:53:21 -0700 |
Pierre-Yves David |
bundle2: make sure standard stream are binary
stable
|
changeset |
files
|
Mon, 19 May 2014 14:39:19 -0700 |
Pierre-Yves David |
revset-benchmark: add max(::(tip~20) - obsolete())
|
changeset |
files
|
Fri, 28 Feb 2014 02:25:58 +0100 |
Mads Kiilerich |
merge: use separate lists for each action type
|
changeset |
files
|
Tue, 20 May 2014 13:55:08 -0700 |
Pierre-Yves David |
changelog: ensure changelog._delaybuf is initialized
stable
|
changeset |
files
|
Thu, 22 May 2014 22:05:26 +0900 |
Yuya Nishihara |
proxy: remove unneeded _set_hostport for compatibility with Python 2.7.7rc1
stable
|
changeset |
files
|
Fri, 23 May 2014 17:29:04 +0100 |
Jim Hague |
bugzilla: support Bugzilla 4.4.3+ API login token authentication (issue4257)
stable
|
changeset |
files
|
Fri, 23 May 2014 13:10:31 -0700 |
Siddharth Agarwal |
resolve: don't abort resolve -l even when no merge is in progress
|
changeset |
files
|
Fri, 23 May 2014 16:25:55 -0700 |
Durham Goode |
templates: fix ifcontains against sets with length > 1 (issue4259)
stable
|
changeset |
files
|
Sun, 25 May 2014 13:47:42 +0200 |
Mads Kiilerich |
run-tests: assign value to ESCAPEMAP - dict.update do not return self
|
changeset |
files
|
Sun, 25 May 2014 13:47:19 +0200 |
Mads Kiilerich |
run-tests: fix invalid reference to stringescape after a36cc85a5b7b
|
changeset |
files
|
Fri, 09 May 2014 18:09:11 -0700 |
Durham Goode |
update: specify custom conflict markers for update (BC)
|
changeset |
files
|
Fri, 09 May 2014 16:13:14 -0700 |
Gregory Szorc |
run-tests: add docstrings
|
changeset |
files
|
Fri, 09 May 2014 15:55:58 -0700 |
Gregory Szorc |
run-tests: avoid duplicate code in vlog()
|
changeset |
files
|
Fri, 25 Apr 2014 15:34:28 -0700 |
Gregory Szorc |
run-tests: make attributes of TestRunner internal
|
changeset |
files
|
Fri, 25 Apr 2014 15:11:38 -0700 |
Gregory Szorc |
run-tests: make testdir an argument of TestSuite.__init__
|
changeset |
files
|
Fri, 25 Apr 2014 15:08:03 -0700 |
Gregory Szorc |
run-tests: move loop to a named argument of TestSuite.__init__
|
changeset |
files
|
Fri, 25 Apr 2014 15:06:23 -0700 |
Gregory Szorc |
run-tests: make keywords a named argument to TestSuite.__init__
|
changeset |
files
|
Fri, 25 Apr 2014 15:03:06 -0700 |
Gregory Szorc |
run-tests: make retest a named argument of TestSuite.__init__
|
changeset |
files
|
Fri, 25 Apr 2014 15:00:54 -0700 |
Gregory Szorc |
run-tests: move whitelist and blacklist to named arguments of TestSuite
|
changeset |
files
|
Fri, 25 Apr 2014 14:51:53 -0700 |
Gregory Szorc |
run-tests: pass jobs into TestSuite constructor
|
changeset |
files
|
Fri, 16 May 2014 13:15:07 -0700 |
Durham Goode |
help: add local/other description to merge tool description
|
changeset |
files
|
Thu, 08 May 2014 16:55:56 -0700 |
Durham Goode |
rebase: specify custom conflict marker labels for rebase (BC)
|
changeset |
files
|
Fri, 09 May 2014 18:15:02 -0700 |
Durham Goode |
graft: customize graft conflict markers (BC)
|
changeset |
files
|
Thu, 08 May 2014 16:54:23 -0700 |
Durham Goode |
merge: add labels parameter from merge.update to filemerge
|
changeset |
files
|
Tue, 22 Apr 2014 13:32:05 -0700 |
Gregory Szorc |
run-tests: move interactive test acceptance into TestResult
|
changeset |
files
|
Tue, 22 Apr 2014 13:25:17 -0700 |
Gregory Szorc |
run-tests: raise WarnTest outside of Test.fail()
|
changeset |
files
|
Tue, 22 Apr 2014 13:16:34 -0700 |
Gregory Szorc |
run-tests: move diff generation into TestResult
|
changeset |
files
|