| Wed, 05 Mar 2014 10:49:43 -0800 |
Pierre-Yves David |
merge: adds documentation to the mergestate class
|
| Wed, 05 Mar 2014 10:22:43 -0800 |
Pierre-Yves David |
merge: add blank line between mergestate's method
|
| Tue, 25 Feb 2014 20:29:46 +0100 |
Mads Kiilerich |
merge: use the right ancestor when both sides copied the same file
|
| 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
|
| Sat, 01 Mar 2014 21:08:28 -0500 |
Augie Fackler |
merge with stable
|
| Sat, 01 Mar 2014 18:09:39 +0100 |
Mads Kiilerich |
merge: audit the right destination file when merging with dir rename
stable 2.9.1
|
| Fri, 28 Feb 2014 02:28:12 +0100 |
Olle Lundberg |
merge: fix spelling of length
|
| Tue, 25 Feb 2014 18:45:01 -0800 |
Pierre-Yves David |
resolve: use "other" changeset from merge state (issue4163)
stable
|
| Tue, 25 Feb 2014 18:54:47 -0800 |
Pierre-Yves David |
merge: add "other" file node in the merge state file
stable
|
| Thu, 27 Feb 2014 14:14:57 -0800 |
Pierre-Yves David |
merge: infer the "other" changeset when falling back to v1 format
stable
|
| Tue, 25 Feb 2014 18:42:11 -0800 |
Pierre-Yves David |
merge: record the "other" node in merge state
stable
|
| Tue, 25 Feb 2014 18:37:06 -0800 |
Pierre-Yves David |
merge: introduce new format for the state file
stable
|
| Thu, 27 Feb 2014 12:59:41 -0800 |
Pierre-Yves David |
merge: change the merge state serialisation to use a record based logic
stable
|
| Tue, 25 Feb 2014 17:14:49 -0800 |
Pierre-Yves David |
merge: move merge state file path into a constant
stable
|
