| Fri, 29 Sep 2006 16:39:38 -0500 |
Matt Mackall |
merge: use repo.parents and parent contexts in update
|
| Tue, 26 Sep 2006 16:21:52 -0500 |
Matt Mackall |
merge: move partial filtering out of manifest merge
|
| Tue, 26 Sep 2006 16:04:07 -0500 |
Matt Mackall |
merge: move findcopies after workingmanifest
|
| Tue, 26 Sep 2006 15:58:51 -0500 |
Matt Mackall |
findcopies: shortcut for empty working dir
|
| Mon, 25 Sep 2006 20:31:05 -0500 |
Matt Mackall |
findcopies: use dirstate rename information
|
| Mon, 25 Sep 2006 16:45:31 -0500 |
Matt Mackall |
Add core copy detection algorithm
|
| Sun, 17 Sep 2006 21:27:30 -0500 |
Matt Mackall |
merge: simplify actions with helper function
|
| Sun, 17 Sep 2006 21:11:26 -0500 |
Matt Mackall |
merge: simplify local created logic
|
| Sun, 17 Sep 2006 20:43:06 -0500 |
Matt Mackall |
merge: simplify prompt code
|
| Sun, 17 Sep 2006 20:38:02 -0500 |
Matt Mackall |
merge: simplify exec flag handling
|
| 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
|
