Re: Problem with psvn.el

Quoth Remi <papaDoc_at_videotron.ca>:
> In emacs I do
> - M-x svn-status
> - I select the directory d:/Nobackup/users/ricard/openode/ode/src
> - In the status buffer I mark a file
> - Then I hit the key = (to have a diff)
> - Then I get the message in the *svn-diff* buffer
> svn: 'BASE' is not under version control
>
> 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:06:08 CET