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

Re: [PROPOSAL] Relaxing diff3 interface requirements documentation

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2006-06-25 01:51:46 CEST

Erik Huelsmann wrote:
> - * the difference between an @a original file, @a modified file, and @a
> latest
> - * file. (The file arguments must be full paths to the files.)
> + * the difference between an @a original file, @a modified file, and @a
> latest
> + * file.

The old text "must be full paths" was poor (not clear whether it meant
"absolute") but if relative paths are to be allowed you need to say what they
are relative to.

> - * @a mine, @a older, and @a yours are utf8-encoded paths, relative to
> @a dir,
> - * to three files that already exist. @a merged is an open file
> handle, and
> + * @a mine, @a older and @a yours are utf8-encoded paths to three files
> + * that already exist. @a merged is an open file handle, and

Same here: you can't just remove that text. Change it to something like
"(absolute, or relative to @a dir)".

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jun 25 01:51:54 2006

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