-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Friday 08 February 2002 08:30 am, Ben Collins-Sussman wrote:
> The format of a .rej file is pretty easy to parse. Couldn't someone
> write some code to do this very quickly? Seems like a bite-sized task
> to me.
I've got this mostly done, although it'll need a lot of testing; I don't have
much logic in the code, and am relying heavily on the information provided by
the .rej file and 'svn diff'.
What I want to know is this:
GIVEN: the .rej file shows the changes between the original file and the
repository file; the changes in the local file are in no way reflected in the
.rej file, and
GIVEN: you can get the diffs between the local file and the repository file,
How do you want the markup to appear in the modified local file? I wanted to
represent all three sets of information, so I was going to use a modified CVS
markup:
>>>>>>>>>> ORIGINAL
... original file lines here
========== REPOSITORY
... repository version lines here
========== LOCAL
... local file lines here
<<<<<<<<<< END
y'all can screw with the script and change the tags, but I'm not going to use
the obtuse CVS versions; I've found they only confuse matters. I'd really
like to use words that humans can understand, like the ones above.
- --
|.. What is this talk of 'release'? Klingons do not make software
<|> 'releases'. Our software 'escapes' leaving a bloody trail of
/|\ designers and quality assurance people in its wake.
/|
|
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQE8ZEOGP0KxygnleI8RAuuLAJ0W+Jh27BZ7PE22cYtQwnoaI5M5OACgwcWM
qawGCH5Z+ZeV3UVvg1QF/xk=
=nf/c
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:05 2006