| Thu, 06 Mar 2014 01:24:03 +0100 |
Olle Lundberg |
histedit: move logic for finding child nodes to new function
|
| Wed, 05 Mar 2014 22:02:45 +0100 |
Olle Lundberg |
histedit: clean up lock imports
|
| Wed, 05 Mar 2014 17:42:05 -0800 |
Lucas Moscovicz |
localrepo: changed revs to use spanset instead of baseset
|
| Wed, 05 Mar 2014 09:31:05 +0000 |
Ed Morley |
extensions: use normpath to allow trailing '\' on Windows (issue4187)
|
| Tue, 04 Mar 2014 09:56:59 -0600 |
Matt Mackall |
tests: fix unused imports from inotify removal caught by pyflakes
|
| Thu, 27 Feb 2014 17:27:03 -0800 |
Lucas Moscovicz |
revset: added ordered generatorset classes with __contains__ method
|
| Tue, 25 Feb 2014 20:29:46 +0100 |
Mads Kiilerich |
merge: use the right ancestor when both sides copied the same file
|
| 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
|
