how does weave/knit merge handle local changes ?

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> The knit/weave merge logic does not seem to have any hook in it to
> consider a local file that is different to the merging revisions. Is
> this correct?

That's not permitted: see WeaveMerger._check_file.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEwkXc0F+nu1YWqI0RApxmAJ99y5FPZDXgj2pEdn3mCU5293nMWQCeK9OP
JUZukB3Zzt/T4MWwQC+AugQ=
=bGXg
-----END PGP SIGNATURE-----