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

Re: problem for a non native reader to understand the manual

From: Brian Denny <brian_at_briandenny.net>
Date: 2003-04-24 20:26:12 CEST

On Thu, Apr 24, 2003 at 07:19:27PM +0200, Robert wrote:
> ...
> BASE The "pristine" revision of an item in a working copy
> I don't understand the word "pristine". Pristine means new according to
> "The Oxford Dictionary", so is this the latest item in the working
> directory?

let's say you check out/update revision 10 of "file.txt". Now you make
some modifications. In the meantime, somebody commits a change to
"file.txt" in revision 13.

BASE means rev. 10.

now you update to rev. 13, merging in changes and resolving conflicts.

BASE now means rev. 13.

now you commit "file.txt", resulting in rev. 14.

BASE now means rev. 14.

another way to think about it is that
  'svn diff -rBASE file.txt'
is the same as
  'svn diff file.txt'

"pristine" in this case means "clean" or "untouched". in other words,
if you check out a file and don't modify it, you could say that that file
is "at" some revision; that revision is BASE.

(subversion keeps a copy of this "pristine" or BASE version in the .svn
directory inside your working copy, so that 'svn diff file.txt' can give
you a diff without goint out to the server.)


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 24 20:22:33 2003

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.