| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop unused diverge initialization
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: refactor some initialization, drop backwards var
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: combine a copy and move case
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop a flag update case
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: combine three identical 'remote is newer' cases
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop 'remote deleted' case
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify 'other deleted' case
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify backwards revert test, ready to combine with other cases
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: allow merging going backwards
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: reorder remote creation tests
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop recreating case
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop an overwrite test
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify a delete case
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: reorder get cases for future simplification
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: fix prompt keep
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: remove a flags case
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: pretend ancestor is local to simplify backwards and overwrite
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify flag merging code slightly
|
file |
diff |
annotate
|
| Fri, 22 May 2009 11:42:21 -0500 |
Steve Borho |
merge: give hint as to how to discover uncommitted changes
|
file |
diff |
annotate
|
| Tue, 19 May 2009 03:59:58 +0200 |
Benoit Boissinot |
update --clean: do not unlink added files (issue575)
|
file |
diff |
annotate
|
| Wed, 13 May 2009 14:08:39 +0200 |
Dirkjan Ochtman |
some modernization cleanups, forward compatibility
|
file |
diff |
annotate
|
| Tue, 28 Apr 2009 17:40:46 +0200 |
Simon Heimberg |
separate import lines from mercurial and general python modules
|
file |
diff |
annotate
|
| Thu, 30 Apr 2009 10:15:32 -0500 |
Steve Borho |
ui: replace regexp pattern with sequence of choices
|
file |
diff |
annotate
|
| Sun, 26 Apr 2009 01:08:54 +0200 |
Martin Geisler |
updated license to be explicit about GPL version 2
|
file |
diff |
annotate
|
| Wed, 22 Apr 2009 00:57:28 +0200 |
Martin Geisler |
replace set-like dictionaries with real sets
|
file |
diff |
annotate
|
| Wed, 22 Apr 2009 02:01:22 +0200 |
Ronny Pfannschmidt |
switch lock releasing in the core from gc to explicit
|
file |
diff |
annotate
|
| Mon, 16 Mar 2009 16:58:41 -0500 |
Matt Mackall |
resolve: move reset to localrepo.commit
|
file |
diff |
annotate
|
| Sun, 15 Feb 2009 10:50:48 -0600 |
Matt Mackall |
merge: mark kept local files as readded on linear update (issue539)
|
file |
diff |
annotate
|
| Tue, 13 Jan 2009 23:17:19 +0100 |
Patrick Mezard |
Merge with crew-stable
|
file |
diff |
annotate
|
| Tue, 13 Jan 2009 22:41:06 +0100 |
Patrick Mezard |
merge: fix execute bit update issue introduced by 89207edf3973
|
file |
diff |
annotate
|