[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Patch command execution

From: Sean Russell <ser_at_germane-software.com>
Date: 2002-02-10 02:05:44 CET

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

On Friday 08 February 2002 08:11 pm, Karl Fogel wrote:
> Nah, are you kidding? :) We're already dependent on GNU diff as an
> external program. Becoming dependent on diff3 is okay too.

Very, very cool. I'd love to use diff3 rather than the way I'm currently
doing, or failing to do, it. I didn't know we were using diff in the SVN
client.

BTW, I have a small nit to pick. The .rej file shows diffs with:

   +_line

where the "_" is a space. However, 'svn diff' produces:

   +line

with no space. You probably wouldn't notice this unless you were, say,
trying to write a script that accessed both diffs, but hey. Consistency here
would be nice, even if the diff formats are otherwise fundamentally different.

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

Yeah, AFAICS. I can find the repository version, and the local version, but
by the time we've got a conflict, the original version is gone. With the
.rej file, the original file could be reconstructed, but the original file
itself is otherwise gone.

What confused me for a short while was that the .rej had nothing to do with
the local file. I think this is why it is so difficult to resolve conflicts
with the current system.

I'm going to junk what I have and rewrite the whole thing using diff3. At
the moment, I'll just patch the repository-version file to reproduce the
original, but if at some point in the future we save the original file, I can
change the script to use that instead.

BTW, Zack mentioned that:

> As a side note, on IRC ben asked people to wait on this project until
> next week because he has massive outstanding changes in get_editor.c
> (to implement svn switch on a single file).

I'm going to go ahead, because I don't see that what Ben's doing is going to
affect what I'm working on in a way that will make me have to start all over
again. The only two things that could happen (that I can see) that will
affect my sub-project is (1) somebody else solves the issue some other way,
or (2) the nature of the diffs change. Since I'm going to be using patch and
diff3 instead of parsing the files myself, I don't think (2) would affect me
much, and if (1) happens... well, c'est la vie.

- --
 |.. What is the difference between Jurassic Park and Microsoft?
<|> - One is an over-rated high tech theme park based on prehistoric
/|\ information and populated mostly by dinosaurs, the other is a
/| Steven Spielberg movie.
 |

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE8ZcdpP0KxygnleI8RAoOVAJ4wh3wUHR2Xvzm7t+EjSwkL5Pab2wCdG3ZI
otSGO4XhTHhDIHL/4ce+0To=
=w4m9
-----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:06 2006

This is an archived mail posted to the Subversion Dev mailing list.