Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop a flag update case
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: combine three identical 'remote is newer' cases
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop 'remote deleted' case
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify 'other deleted' case
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify backwards revert test, ready to combine with other cases
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: allow merging going backwards
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: reorder remote creation tests
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop recreating case
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop an overwrite test
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify a delete case
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: reorder get cases for future simplification
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: fix prompt keep
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: remove a flags case
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: pretend ancestor is local to simplify backwards and overwrite
|
Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify flag merging code slightly
|