[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: Paul Lussier <pll_at_lanminds.com>
Date: 2003-04-24 19:59:55 CEST

Hi Robert,

Welcome. I will try to help you here :)

In a message dated: Thu, 24 Apr 2003 19:19:27 +0200
Robert said:

>Please help me, [...snip...]
>I don't understand the word "pristine". Pristine means new according to
>"The Oxford Dictionary", so is this the latest item in the working

Pristine does mean 'new', but in this sense of the word, it is meant
to imply that it is a 'like new' copy. It does not have any
modifications made to it, no extra files which should not be there,
it is a "pristine" copy of the original. Where as a normal working
copy directory, after some development work or build cycle would no
longer be "pristine" exactly because files have changed or been added.

Pristine is often used to convey a sense of cleanliness and order to

I hope that helps.

>On page 28:
>(Bullet) For every conflicted file, Subversion places three extra files
>in your working copy:
>filename.*.mine ok, that seems clear, that is the file in my working
>copy with my latest changes made locally.
>filename.*.rOLDREV ?? Than that must be a copy of the above before I
>made local changes
>filename.*.rNEWREV This must be the latest file in the repository, am I

Well, this is rather confusing, even to a native speaker :) I just
reviewed the book on the web, and it states the following:

filename.*.mine This is your file as it existed in your working
                  copy before you updated your working copy - that
                  is, without conflict markers. This file has your
                  latest changes in it and nothing else.

Which I find very confusing. Intuitively, you would think that you
can't have a file be as it was in your working copy *before* you
updated your working copy *and* have it contain your latest changes.

This seems to be saying two contradictory things, however, what I
think is being said here is this:

        filename.*.mine is the version of the file as it existed
        before your ran 'svn up'.

filename.*.rOLDREV This is the file that was the BASE revision
                    before you updated your working copy. That is, the
                    file that you checked out before you made your
                    latest edits.

In other words, filename.*.rOLDREV is the 'pristine' version of the
file as it existed when you first checked out this working copy.
It does not contain any of your recent changes, since all those are
contained in 'filename.*.mine'.

filename.*.rNEWREV This is the file that your Subversion client
                    just received from the server when you updated your
                    working copy. This file corresponds to the HEAD
                    revision of the repository.

This file is the file as it currently exists on the server, but is
somehow different with the file currently in your working copy. This
conflict is exactly what caused the creation of these three files to

So, to summarise:
        filename.*.rNEWREV The current version of the file on the server
        filename.*.rOLDREV The version of the file you checked out
        filename.*.mine Your working copy of the file with recent changes

I hope this helps!

Key fingerprint = 1660 FECC 5D21 D286 F853  E808 BB07 9239 53F1 28EE
	It may look like I'm just sitting here doing nothing,
   but I'm really actively waiting for all my problems to go away.
	 If you're not having fun, you're not doing it right!
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:00:45 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.