| Tue, 25 Feb 2014 20:29:14 +0100 |
Mads Kiilerich |
copies: when both sides made the same copy, report it as a copy
|
| Sun, 02 Mar 2014 18:36:02 +0100 |
Mads Kiilerich |
merge: handle create+delete prompts in calculateupdates
|
| Fri, 28 Feb 2014 02:26:03 +0100 |
Mads Kiilerich |
merge: handle acceptremove of create+delete early in manifest merge
|
| Sun, 02 Mar 2014 18:30:41 +0100 |
Mads Kiilerich |
largefiles: override calculateupdates instead of manifestmerge
|
| Tue, 25 Feb 2014 20:28:40 +0100 |
Mads Kiilerich |
tests: add systematic test of merge ancestor calculation
|
| Sun, 02 Mar 2014 18:25:19 +0100 |
Mads Kiilerich |
tests: add test case for criss cross merge
|
| Mon, 03 Mar 2014 15:34:09 -0600 |
Matt Mackall |
merge with stable
|
| Mon, 03 Mar 2014 12:54:46 -0800 |
Lucas Moscovicz |
revset: changed generatorset code to remove unnecesary function call
|
| Mon, 03 Mar 2014 15:50:45 +0900 |
Yuya Nishihara |
phase: say "Returns 0" instead of "Return 0" like other command help
stable
|
| Mon, 03 Mar 2014 15:50:41 +0900 |
Yuya Nishihara |
dirstate: remove double imports of errno
|
| Mon, 03 Mar 2014 15:50:51 +0900 |
Yuya Nishihara |
cmdserver: mask return code of runcommand in the same way as dispatch.run
|
| Mon, 03 Mar 2014 15:50:48 +0900 |
Yuya Nishihara |
cmdserver: include non-zero return code of runcommand in test output
|
| Mon, 03 Mar 2014 19:41:30 +0900 |
Yuya Nishihara |
cmdserver: recreate mq object on runcommand in case queue path was changed
|
| Mon, 03 Mar 2014 19:41:26 +0900 |
Yuya Nishihara |
cmdserver: reload mq on each runcommand request to avoid corruption
|
| Mon, 03 Mar 2014 19:41:23 +0900 |
Yuya Nishihara |
localrepo: add hook point to invalidate everything on each command-server run
|
