| Tue, 19 Jan 2010 22:20:08 -0600 |
Matt Mackall |
Update license to GPLv2+
stable
|
file |
diff |
annotate
|
| Sun, 08 Nov 2009 10:29:52 -0600 |
Matt Mackall |
submerge: properly deal with overwrites
|
file |
diff |
annotate
|
| Sat, 07 Nov 2009 16:30:42 -0600 |
Matt Mackall |
subrepo: notice dirty subrepo states when merging
|
file |
diff |
annotate
|
| Thu, 05 Nov 2009 10:53:59 +0100 |
Stuart W Marks |
update: allow branch crossing without -c or -C, with no uncommitted changes
|
file |
diff |
annotate
|
| Thu, 05 Nov 2009 10:53:36 +0100 |
Stuart W Marks |
update: add comments and test cases for updating across branches
|
file |
diff |
annotate
|
| Sat, 19 Sep 2009 01:15:38 +0200 |
Martin Geisler |
do not attempt to translate ui.debug output
|
file |
diff |
annotate
|
| Sun, 21 Jun 2009 01:13:19 +0200 |
Simon Heimberg |
ui: extract choice from prompt
|
file |
diff |
annotate
|
| Sun, 05 Jul 2009 11:01:01 +0200 |
Alejandro Santos |
compat: can't compare two values of unequal datatypes
|
file |
diff |
annotate
|
| Mon, 15 Jun 2009 02:45:38 -0500 |
Matt Mackall |
subrepo: add update/merge logic
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: refactor manifestmerge init to better report effective ancestor
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify file revision comparison logic
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: make locally-added file test more correct
|
file |
diff |
annotate
|
| 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
|