| 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
|
| Mon, 10 Feb 2014 00:43:54 +0100 |
Mads Kiilerich |
merge: don't overwrite file untracked after remove, abort with 'untracked files'
stable
|
| Wed, 15 Jan 2014 16:41:18 -0600 |
Sean Farley |
merge: consider successor changesets for a bare update
|
| Wed, 06 Nov 2013 17:02:07 -0600 |
Sean Farley |
merge: refactor initialization of variables in update
|
| Wed, 06 Nov 2013 10:26:25 -0600 |
Sean Farley |
merge: update comment for future devs
|
| Wed, 06 Nov 2013 10:20:18 -0800 |
Siddharth Agarwal |
merge: move forgets to the beginning of the action list
stable
|
| Thu, 24 Oct 2013 01:49:56 +0800 |
Mads Kiilerich |
spelling: random spell checker fixes
stable
|
| Tue, 01 Oct 2013 17:43:54 -0700 |
Siddharth Agarwal |
merge: exit early during a no-op update (BC)
|
| Mon, 23 Sep 2013 20:53:14 -0700 |
Siddharth Agarwal |
merge: standardize error message for dirty subrepo
|
| Mon, 23 Sep 2013 20:50:51 -0700 |
Siddharth Agarwal |
merge: standardize error message for dirty working dir
|
| Mon, 23 Sep 2013 20:33:02 -0700 |
Siddharth Agarwal |
update: standardize error message for dirty update --check
|
| Mon, 23 Sep 2013 20:08:52 -0700 |
Siddharth Agarwal |
update: improve error message for dirty non-linear update with rev
|
| Mon, 23 Sep 2013 20:07:30 -0700 |
Siddharth Agarwal |
update: add error message for dirty non-linear update with no rev
|
| Mon, 23 Sep 2013 17:43:33 -0700 |
Siddharth Agarwal |
update: improve error message for clean non-linear update
|
| Thu, 25 Jul 2013 00:33:28 -0500 |
Matt Mackall |
update: add tracking of interrupted updates (issue3113)
stable
|
| Mon, 03 Jun 2013 17:20:37 -0700 |
Bryan O'Sullivan |
merge: add a files method to the mergestate class
|
