Sean Russell wrote:
>-----BEGIN PGP SIGNED MESSAGE-----
>Hash: SHA1
>
>On Monday 11 February 2002 10:35, Ben Collins-Sussman wrote:
>
>>If something's wrong, it sounds like 'patch' is misbehaving. I mean,
>>we create a diff between old-text-base and new-text-base, then have
>>'patch' apply that diff to the working file, with a .rej file on the
>>commandline. I don't know why 'patch' would only put partial rejects
>>into the .rej file...
>>
>
>Hmmm... is patch being used to create the .rej files? I'd think that would
>be the job of diff.
>
Nope, that's patch's job. We pull the text from the server, make a diff
vs. the puretext, and use patch to apply that to the local version.
(Which is wrong, as Zack rightly pointed out. :-)
>To clarify, the problem was that the .rej file generated by 'svn up' was
>missing the diff for the second change. I don't want to raise any alarm
>flags about this until I know I can reproduce it; that's why I asked about
>any known issues.
>
The .rej file only contains hunks that patch couldn't apply. If the
first hunk fails, and the second succeeds, you'll only get the first in
the .rej; the second will be merged into the source. So that's as it
should be.
>
>
>- --
> |.. "One World, one Web, one Program" - Microsoft promotional ad
><|> "Ein Volk, ein Reich, ein Fuhrer" - Adolf Hitler
>/|\
>/|
> |
>-----BEGIN PGP SIGNATURE-----
>Version: GnuPG v1.0.6 (GNU/Linux)
>Comment: For info see http://www.gnupg.org
>
>iD8DBQE8Z6FJP0KxygnleI8RAjehAJ9eZnCIaTx+euTwqiQpdgZr/+kB6QCfbkHR
>rBF/aZnLBy0KtjuzjbnxRig=
>=CahP
>-----END PGP SIGNATURE-----
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: dev-help@subversion.tigris.org
>
--
Brane Čibej <brane_at_xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
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:06 2006