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

Re: Problem with psvn.el

From: Sebastian Tennant <sebyte_at_gmail.com>
Date: Fri, 29 Feb 2008 09:06:34 +0200

Quoth Remi <papaDoc_at_videotron.ca>:
> So my problem is :
> - There is no file BASE
> - Why it is complaining about this 'BASE'

I'm no expert, but I know that BASE refers to the 'base' revision of the
file you are trying to diff.

This little pic should help you to understand some of svn's terminology:

 Here, a working copy of file.rb is updated to r2 and then another
 party makes a commit, taking file.rb to r3:

               PREV BASE HEAD
             +-------+ +------+ +------+
             | | | | | |
   file.rb --| r1 |--------| r2 |--------| r3 |-->
             | | | | | |
             +-------+ +------+ +------+
                                u||d /\c
                                p||a n||o
                                 ||t e||m
                                 \/e w||m
                              +------+ i
 r1 is working copy's PREV | | t
 r2 is working copy's BASE | r2 |
 r3 is the repository's HEAD | |
                              +------+
                            working copy

HTH,

Sebastian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-02-29 08:07:06 CET

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

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