| Mon, 07 Mar 2011 15:03:10 -0600 |
Matt Mackall |
merge: back out single-parent fast-forward merge
stable
|
| Sat, 05 Mar 2011 16:34:59 -0600 |
Matt Mackall |
merge: drop resolve state for mergers with identical contents (issue2680)
|
| Wed, 16 Feb 2011 08:56:11 -0800 |
Oleg Stepanov |
Do not allow merging with uncommitted changes in a subrepo
stable
|
| Fri, 24 Dec 2010 15:23:01 +0100 |
Dan Villiom Podlaski Christiansen |
explicitly close files
|
| Mon, 31 Jan 2011 13:38:00 +0100 |
Martin Geisler |
merge with stable
|
| Mon, 31 Jan 2011 13:33:41 +0100 |
Erik Zielke |
subrepo: make update -C clean the working directory for svn subrepos
stable
|
| Sun, 02 Jan 2011 19:34:41 +0100 |
Adrian Buehlmann |
rename util.unlink to unlinkpath
|
| Mon, 13 Dec 2010 11:46:31 -0500 |
Greg Ward |
merge: document some internal return values.
|
| Tue, 07 Dec 2010 03:29:21 +0100 |
Mads Kiilerich |
merge: fast-forward merge with descendant
|
| Sun, 10 Oct 2010 09:50:25 -0500 |
Dan Villiom Podlaski Christiansen |
merge: make 'diverging renames' diagnostic a more helpful note.
|
| Mon, 02 Aug 2010 07:15:47 +0300 |
timeless |
merge/progress: marking strings for localization
|
| Sat, 09 Oct 2010 17:02:28 -0500 |
Brodie Rao |
update: use higher level wording for "crosses branches" error
|
| Sat, 09 Oct 2010 14:50:20 -0500 |
Matt Mackall |
merge: handle no file parent in backwards merge (issue2364)
|
| Fri, 24 Sep 2010 12:46:54 -0500 |
Matt Mackall |
backout most of 4f8067c94729
|
| Thu, 23 Sep 2010 00:02:31 -0500 |
Brodie Rao |
cleanup: use x in (a, b) instead of x == a or x == b
|
