| 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
|
| Fri, 15 Aug 2014 14:33:19 +0900 |
Yuya Nishihara |
annotate: inline definition of decorate() functions
|
| Fri, 15 Aug 2014 14:29:30 +0900 |
Yuya Nishihara |
annotate: rewrite long short-circuit statement by if-elif-else
|
| Tue, 24 Jun 2014 17:27:18 +0100 |
Pierre-Yves David |
revert: use modified information from both statuses
|
| Tue, 24 Jun 2014 16:57:16 +0100 |
Pierre-Yves David |
revert: drop special case handling for file unknown in parent
|
| Tue, 24 Jun 2014 16:53:22 +0100 |
Pierre-Yves David |
revert: use "remove" information from both statuses
|
| Fri, 01 Aug 2014 18:27:47 -0700 |
Pierre-Yves David |
revert: process removed files missing in target as clean
|
| Thu, 31 Jul 2014 15:52:56 -0700 |
Pierre-Yves David |
revert: also track clean files
|
| Fri, 01 Aug 2014 18:57:53 -0700 |
Pierre-Yves David |
revert: triage "deleted" files into more appropriate categories
|
| Fri, 15 Aug 2014 10:54:15 -0500 |
Matt Mackall |
unshelve: silence internal revert
|
| Fri, 15 Aug 2014 10:47:03 -0500 |
Matt Mackall |
tests: fixup issue markers to make check-commit happy
|
