| Fri, 17 Jun 2011 15:21:02 -0500 |
Augie Fackler |
update: check wc.dirty() before setting overwrite=True
|
file |
diff |
annotate
|
| Tue, 31 May 2011 11:52:22 -0700 |
Brendan Cully |
Make pull -u behave like pull && update
|
file |
diff |
annotate
|
| Thu, 26 May 2011 17:15:35 -0500 |
Matt Mackall |
dirstate: rename forget to drop
|
file |
diff |
annotate
|
| Sun, 22 May 2011 11:03:15 +0200 |
Adrian Buehlmann |
applyupdates: audit merged files
|
file |
diff |
annotate
|
| Sat, 21 May 2011 23:21:12 +0200 |
Adrian Buehlmann |
applyupdates: audit path on flag changes
|
file |
diff |
annotate
|
| Sat, 21 May 2011 02:05:00 +0200 |
Adrian Buehlmann |
applyupdates: audit unlinking of renamed files and directories
|
file |
diff |
annotate
|
| Fri, 06 May 2011 15:22:31 +0200 |
Adrian Buehlmann |
rename util.set_flags to setflags
|
file |
diff |
annotate
|
| Fri, 06 May 2011 09:54:06 +0200 |
Adrian Buehlmann |
rename path_auditor to pathauditor
|
file |
diff |
annotate
|
| Mon, 02 May 2011 10:11:18 +0200 |
Dan Villiom Podlaski Christiansen |
prevent transient leaks of file handle by using new helper functions
|
file |
diff |
annotate
|
| Sat, 30 Apr 2011 13:59:14 +0200 |
Alexander Solovyov |
remove unused imports and variables
|
file |
diff |
annotate
|
| Wed, 20 Apr 2011 22:43:31 +0200 |
Adrian Buehlmann |
move path_auditor from util to scmutil
|
file |
diff |
annotate
|
| Mon, 04 Apr 2011 16:21:59 -0500 |
Matt Mackall |
misc: replace .parents()[0] with p1()
|
file |
diff |
annotate
|
| Mon, 04 Apr 2011 15:25:20 -0500 |
Matt Mackall |
merge: add ancestor to the update function
|
file |
diff |
annotate
|
| Wed, 23 Mar 2011 09:20:40 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 22 Mar 2011 12:00:38 -0500 |
Matt Mackall |
merge: avoid unlinking destination of merge when case changes (issue2715)
stable
|
file |
diff |
annotate
|
| Tue, 08 Mar 2011 01:21:50 +0100 |
Mads Kiilerich |
merge: remove last traces of fastforward merging
|
file |
diff |
annotate
|
| Mon, 07 Mar 2011 15:03:10 -0600 |
Matt Mackall |
merge: back out single-parent fast-forward merge
stable
|
file |
diff |
annotate
|
| Sat, 05 Mar 2011 16:34:59 -0600 |
Matt Mackall |
merge: drop resolve state for mergers with identical contents (issue2680)
|
file |
diff |
annotate
|
| Wed, 16 Feb 2011 08:56:11 -0800 |
Oleg Stepanov |
Do not allow merging with uncommitted changes in a subrepo
stable
|
file |
diff |
annotate
|
| Fri, 24 Dec 2010 15:23:01 +0100 |
Dan Villiom Podlaski Christiansen |
explicitly close files
|
file |
diff |
annotate
|
| Mon, 31 Jan 2011 13:38:00 +0100 |
Martin Geisler |
merge with stable
|
file |
diff |
annotate
|
| Mon, 31 Jan 2011 13:33:41 +0100 |
Erik Zielke |
subrepo: make update -C clean the working directory for svn subrepos
stable
|
file |
diff |
annotate
|
| Sun, 02 Jan 2011 19:34:41 +0100 |
Adrian Buehlmann |
rename util.unlink to unlinkpath
|
file |
diff |
annotate
|
| Mon, 13 Dec 2010 11:46:31 -0500 |
Greg Ward |
merge: document some internal return values.
|
file |
diff |
annotate
|
| Tue, 07 Dec 2010 03:29:21 +0100 |
Mads Kiilerich |
merge: fast-forward merge with descendant
|
file |
diff |
annotate
|
| Sun, 10 Oct 2010 09:50:25 -0500 |
Dan Villiom Podlaski Christiansen |
merge: make 'diverging renames' diagnostic a more helpful note.
|
file |
diff |
annotate
|
| Mon, 02 Aug 2010 07:15:47 +0300 |
timeless |
merge/progress: marking strings for localization
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 17:02:28 -0500 |
Brodie Rao |
update: use higher level wording for "crosses branches" error
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 14:50:20 -0500 |
Matt Mackall |
merge: handle no file parent in backwards merge (issue2364)
|
file |
diff |
annotate
|
| Fri, 24 Sep 2010 12:46:54 -0500 |
Matt Mackall |
backout most of 4f8067c94729
|
file |
diff |
annotate
|