Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 12:39:51 -0700] rev 3253
patchbomb: update --attach to use cmdutil.make_filename
Matt Mackall <mpm@selenic.com> [Fri, 06 Oct 2006 16:55:11 -0500] rev 3252
merge: copy fixes and tests
Fix up "already seen" logic
Fix merge action in remote copy case
Add status message
Add lots of merge+copy/move test cases
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 19:08:04 -0500] rev 3251
merge: fixes for merge+rename
findcopies: ignore files renamed on both branches
applyupdates: change remove flag to move
recordupdates: record copy actions, including local moves and deletions
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 17:59:27 -0500] rev 3250
Make status -C work with merge+rename
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 15:43:27 -0500] rev 3249
merge: add rename following
Currently disabled by default, enable with
[merge]
followcopies = 1
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 14:33:22 -0500] rev 3248
merge: reduce manifest copying