| Fri, 15 Aug 2014 11:48:05 -0500 |
Matt Mackall |
merge with stable
|
changeset |
files
|
| Fri, 15 Aug 2014 23:05:53 +0900 |
FUJIWARA Katsunori |
rebase: use "rebase.collapse" as "editform" for "--collapse" always
|
changeset |
files
|
| Fri, 15 Aug 2014 23:05:53 +0900 |
FUJIWARA Katsunori |
ui: invoke editor for committing with HGEDITFORM environment variable
|
changeset |
files
|
| Fri, 15 Aug 2014 04:37:46 +0200 |
Mads Kiilerich |
cleanup: name unused variables using convention of leading _
|
changeset |
files
|
| Fri, 15 Aug 2014 16:20:47 +0200 |
Mads Kiilerich |
cleanup: rename check-translation.py checker function - don't hide global var
|
changeset |
files
|
| Fri, 15 Aug 2014 04:37:45 +0200 |
Mads Kiilerich |
cleanup: remove some unused / duplicate imports
|
changeset |
files
|
| Fri, 15 Aug 2014 04:37:46 +0200 |
Mads Kiilerich |
cleanup: fix some list comprehension redefinitions of existing vars
|
changeset |
files
|
| Fri, 15 Aug 2014 16:20:47 +0200 |
Mads Kiilerich |
cleanup: avoid local vars shadowing imports
|
changeset |
files
|
| Fri, 15 Aug 2014 16:20:47 +0200 |
Mads Kiilerich |
cleanup: avoid _ for local unused tmp variables - that is reserved for i18n
|
changeset |
files
|
| Fri, 15 Aug 2014 04:37:45 +0200 |
Mads Kiilerich |
cleanup: make sure we always access members of imported modules
|
changeset |
files
|
| Fri, 15 Aug 2014 20:28:51 +0900 |
FUJIWARA Katsunori |
largefiles: update lfdirstate for unchanged largefiles during linear merging
|
changeset |
files
|
| Fri, 15 Aug 2014 20:28:51 +0900 |
FUJIWARA Katsunori |
largefiles: keep largefiles from colliding with normal one during linear merge
|
changeset |
files
|
| 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
|