Re: Patch command execution

Sean Russell <ser@germane-software.com> writes:
> I wish. Can we base this on diff3? I thought we specifically couldn't use
> the diff tools because of licensing issues. If we can't embed the code into
> SVN, I'd rather not base utility scripts on them either.

Nah, are you kidding? :) We're already dependent on GNU diff as an
external program. Becoming dependent on diff3 is okay too.

It's because we can't embed the code in Subversion that we drive it as
external programs. There's nothing wrong with basing scripts on them.
We're perfectly free to ship any of the GNU tools with Subversion, by
the way (c.f. the GPL), the legal problem only arises if we link them
into our executable.

As my mother always used to tell me, don't write diff3 if you don't
have to. :-)

> In any case, I don't know much about diff3, but the superficial problem is
> that, by the time we're doing the merges, we've lost the original file; all
> we have are the diffs in the .rej file. So, I'd have to reconstruct the
> original file from the repository file and then do a three-way diff using
> diff3, if that's possible.

You mean we've lost the original working file? Subversion can save it
somewhere, if it's not we can change that...

-K

---------------------------------------------------------------------
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