On 2010-08-15 23:30:09 -0700, Bert Huijben wrote:
> > BTW, the local pristine version does correspond to some revision
> > in the repository. It shouldn't be mixed up with the working copy
> > version.
>
> What if the file is a copy?
In my example, it wasn't a copy. But...
> In that case BASE refers to the pristine version of the copy. So no: it
> doesn't refer to just a revision.
What I meant is that the pristine version refers to something that
exists in the repository at some revision.
For instance, if everything is at revision 17, and you do:
svn cp foo bar
then the pristine version of both files corresponds to f...@17.
Then if you consider "svn diff bar", the Subversion book says:
If TARGET is a working copy path, the default behavior (when no
--revision option is provided) is to display the differences between
the base and working copies of TARGET.
It is a bit ambiguous: by base, does it mean f...@17 or b...@17 ?
Intuitively, it should be f...@17. But it also says:
If a --revision option is specified in this scenario, though, it
means:
--revision N:M
The server compares tar...@n and tar...@m.
--revision N
The client compares tar...@n against the working copy.
That would mean for "svn diff -r17 bar", TARGET being "bar", one would
have the difference between b...@17 and the working copy of bar. This
is IMHO incorrect and not the visible behavior.
--
Vincent Lefèvre <[email protected]> - Web: <http://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <http://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / Arénaire project (LIP, ENS-Lyon)
