Sun, 17 Sep 2006 20:18:27 -0500 |
Matt Mackall |
merge: simplify tests for local changed/remote deleted
|
Sun, 17 Sep 2006 20:10:54 -0500 |
Matt Mackall |
merge: more simplification of m2 manifest scanning
|
Sun, 17 Sep 2006 20:00:14 -0500 |
Matt Mackall |
merge: reorder tests on m2 items in manifestmerge
|
Sun, 17 Sep 2006 19:54:01 -0500 |
Matt Mackall |
merge: eliminate redundant security check
|
Sun, 17 Sep 2006 19:53:19 -0500 |
Matt Mackall |
merge: eliminate confusing queued variable
|
Sun, 17 Sep 2006 18:28:50 -0500 |
Matt Mackall |
merge: remove no longer possible clause
|
Sun, 17 Sep 2006 17:39:19 -0500 |
Matt Mackall |
merge: move apply and dirstate code into separate functions
|
Sun, 17 Sep 2006 17:13:02 -0500 |
Matt Mackall |
merge: remove linear variable
|
Sun, 17 Sep 2006 17:07:44 -0500 |
Matt Mackall |
merge: simplify hook code
|
Sun, 17 Sep 2006 16:50:17 -0500 |
Matt Mackall |
merge: linear_path -> linear
|
Sun, 17 Sep 2006 16:47:33 -0500 |
Matt Mackall |
merge: pull manifest checks and updates into separate functions
|
Sun, 17 Sep 2006 16:13:34 -0500 |
Matt Mackall |
merge: remove now unused umap dict
|
Sun, 17 Sep 2006 16:13:03 -0500 |
Matt Mackall |
merge: pull manifest comparison out into separate function
|
Sun, 17 Sep 2006 16:02:09 -0500 |
Matt Mackall |
Merge with mainline
|
Sun, 17 Sep 2006 15:59:59 -0500 |
Matt Mackall |
merge: move set_exec to actions
|