-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Larry Jones wrote:
|Derek Robert Price writes: | |>1. The files are likely to have a similar base given the similar name, |>as has been the case nearly every time I have encountered this problem |>myself, and we might be able to work out something with merging... if |>the diff between the two files is under a certain proportional size, |>then the diff could probably usefully be inserted into the file between |>merge markers for the user. | | |So you're proposing doing a 2-way diff in that case? As far as I know, |the existing diff code always does 3-way diffs, so that would probably |require quite a bit of infrastructure.
I don't have time to go through the whole man page tonight, but it seems to me that diff's if-then-else format and the --*-group-format=FORMAT options, if they can't implement the result we want exactly, should require little hacking to persuade them to do so.
Nevermind. Found the relevant option in diff's info page - it shouldn't require any hacking at the diff source at all:
- --changed-group-format='<<<<<<< %< ======= %> |>>>>>>'
Or something close to that. Since the format specifier is just a string, the revision or name of a file could be added to the string with ease to match the other merge output formats.
Derek
- -- ~ *8^)
Email: [EMAIL PROTECTED]
Get CVS support at <http://ximbiot.com>!
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (GNU/Linux) Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org
iD8DBQE/hfZcLD1OTBfyMaQRAjl/AJ9QKtUxaxmBDd8LoNMOP32+l+TcbACgsMD1 SZ5tbg0aY43FytZye017MMk= =lm86 -----END PGP SIGNATURE-----
_______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
