| Fri, 15 Aug 2014 20:28:51 +0900 |
FUJIWARA Katsunori |
largefiles: add test for large/normal conflict at linear merging
|
changeset |
files
|
| Fri, 15 Aug 2014 20:28:51 +0900 |
FUJIWARA Katsunori |
largefiles: put whole "hgmerge" process into the same "wlock" scope
|
changeset |
files
|
| Fri, 15 Aug 2014 20:28:51 +0900 |
FUJIWARA Katsunori |
largefiles: put whole "hgupdaterepo" process into the same "wlock" scope
|
changeset |
files
|
| Fri, 15 Aug 2014 14:33:19 +0900 |
Yuya Nishihara |
annotate: inline definition of decorate() functions
|
changeset |
files
|
| Fri, 15 Aug 2014 14:29:30 +0900 |
Yuya Nishihara |
annotate: rewrite long short-circuit statement by if-elif-else
|
changeset |
files
|
| Tue, 24 Jun 2014 17:27:18 +0100 |
Pierre-Yves David |
revert: use modified information from both statuses
|
changeset |
files
|
| Tue, 24 Jun 2014 16:57:16 +0100 |
Pierre-Yves David |
revert: drop special case handling for file unknown in parent
|
changeset |
files
|
| Tue, 24 Jun 2014 16:53:22 +0100 |
Pierre-Yves David |
revert: use "remove" information from both statuses
|
changeset |
files
|
| Fri, 01 Aug 2014 18:27:47 -0700 |
Pierre-Yves David |
revert: process removed files missing in target as clean
|
changeset |
files
|
| Thu, 31 Jul 2014 15:52:56 -0700 |
Pierre-Yves David |
revert: also track clean files
|
changeset |
files
|
| Fri, 01 Aug 2014 18:57:53 -0700 |
Pierre-Yves David |
revert: triage "deleted" files into more appropriate categories
|
changeset |
files
|
| Fri, 15 Aug 2014 10:54:15 -0500 |
Matt Mackall |
unshelve: silence internal revert
|
changeset |
files
|
| Fri, 15 Aug 2014 10:47:03 -0500 |
Matt Mackall |
tests: fixup issue markers to make check-commit happy
|
changeset |
files
|
| Fri, 15 Aug 2014 03:24:40 +0200 |
Mads Kiilerich |
incoming: don't request heads that already are common
stable
|
changeset |
files
|
| Fri, 15 Aug 2014 03:24:40 +0200 |
Mads Kiilerich |
tests: improve test coverage for discovery and actual parameters for pulling
stable
|
changeset |
files
|
| Fri, 15 Aug 2014 02:46:44 +0200 |
Mads Kiilerich |
changectx: ancestor should only prefer merge.preferancestor if it is a revision
stable
|
changeset |
files
|
| Fri, 15 Aug 2014 02:39:01 +0200 |
Mads Kiilerich |
merge: show the scary multiple ancestor hint for merges only, not for updates
stable
|
changeset |
files
|
| Thu, 14 Aug 2014 16:26:41 -0700 |
Pierre-Yves David |
discovery: prevent crash on unknown remote heads with old repo (issue4337)
stable
|
changeset |
files
|
| Thu, 14 Aug 2014 14:59:42 -0700 |
Pierre-Yves David |
obsstore.create: add a simple safeguard against cyclic markers
stable
|
changeset |
files
|
| Thu, 14 Aug 2014 14:57:03 -0700 |
Pierre-Yves David |
debugobsolete: catch ValueError that may be raised by obsstore.create
stable
|
changeset |
files
|
| Thu, 14 Aug 2014 16:39:27 -0500 |
Matt Mackall |
check-code: extend try/except/finally check for multiple except clauses
|
changeset |
files
|
| Thu, 14 Aug 2014 16:39:02 -0500 |
Matt Mackall |
repoview: fix try/except/finally for py2.4
|
changeset |
files
|
| Thu, 14 Aug 2014 16:25:47 -0500 |
Matt Mackall |
merge with stable
|
changeset |
files
|
| Thu, 14 Aug 2014 16:18:45 -0500 |
Matt Mackall |
test-run-tests: fix up slash/backslash on diff chunks for Windows
stable
|
changeset |
files
|
| Wed, 13 Aug 2014 15:55:45 -0700 |
Siddharth Agarwal |
test-largefiles: add test for hg log --follow --patch with path
stable
|
changeset |
files
|
| Wed, 13 Aug 2014 15:51:33 -0700 |
Siddharth Agarwal |
largefiles: don't override matchandpats for always matchers (issue4334)
stable
|
changeset |
files
|
| Wed, 13 Aug 2014 15:18:41 -0700 |
Siddharth Agarwal |
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
stable
|
changeset |
files
|
| Wed, 13 Aug 2014 15:13:50 -0700 |
Siddharth Agarwal |
largefiles: drop setting lfstatus in overridelog (issue4334)
stable
|
changeset |
files
|