Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 27 Sep 2006 09:35:53 +0200] rev 3164
merge with mainline
Matt Mackall <mpm@selenic.com> [Tue, 26 Sep 2006 16:21:52 -0500] rev 3163
merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com> [Tue, 26 Sep 2006 16:04:07 -0500] rev 3162
merge: move findcopies after workingmanifest
Matt Mackall <mpm@selenic.com> [Tue, 26 Sep 2006 15:58:51 -0500] rev 3161
findcopies: shortcut for empty working dir
TK Soh <teekaysoh@yahoo.com> [Tue, 26 Sep 2006 14:40:21 -0500] rev 3160
do not disclose proxy user and password in debug messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Sep 2006 13:58:58 +0200] rev 3159
fix users of dirstate.copies broken by b1f10d3223c1
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 22:26:54 -0500] rev 3158
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 20:31:05 -0500] rev 3157
findcopies: use dirstate rename information
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 17:53:17 -0500] rev 3156
dirstate: add copies function
rename copies to copymap
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 16:45:31 -0500] rev 3155
Add core copy detection algorithm
This adds findcopies, which detects merge-relevant copies between
files in a pair of manifests back to the merge ancestor.
While the merge code invokes the copy detection routine, it does not
yet use the result.