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