[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-02-09 05:09:52 CET

"Jay Freeman \(saurik\)" <saurik@saurik.com> writes:

> Also, what's this about not commiting when ".rej" files exist... doesn't
> that sound kind of special case-y? What if I have files that end with
> ".rej" that I want to commit to my repository? If they are already
> special cased, is there code to make sure they don't get added by
> accident? A little more general: what happens on platforms that don't
> support multiple extensions, or have hard upper limits on filenames?

Before we run 'patch', we reserve a *unique* temporary .rej filename.
Look at svn_io.h:svn_io_open_unique_file(). If patch produces
conflicts, they are sent into this .rej file, and the .rej file is
tracked in the .svn/entries file. If you attempt to commit the file
and the .rej file still exists, the client notices and aborts. This
is the status quo already: you have to remove the .rej file to commit.

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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.