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

Re: '@BASE keyword' vs. 'BASE database-tree' vs 'BASE conceptual-tree' (Was: RE: '@BASE' vs. 'BASE tree' -- was: Re: svn_wc__db_base_get_info() vs. svn_wc__db_read_info() ?)

From: Neels J Hofmeyr <neels_at_elego.de>
Date: Fri, 29 Jan 2010 16:29:36 +0100

(I thought this was worth pulling out of the rest of the thread)

Bert Huijben wrote:
> What he gets now is a diff of file compared to the checked out version of file at its original location ('other-file')
>
> This is in all cases (1.0-1.6-x) exactly equivalent to:
> svn cat file > a.now
> svn cat file -r BASE > a.old
> diff -u a.old a.now

Bert, note that
  'svn cat file'
is exactly the same as
  'svn cat file -r BASE'!

A test shows:
[[[
+ svn st
R + file
+ svn cat file
r1 for other-file, i.e. the *copied-here* file's history!
+ svn cat file_at_BASE
r1 for other-file, i.e. the *copied-here* file's history!
+ svn cat file -r BASE
r1 for other-file, i.e. the *copied-here* file's history!
]]]

'svn cat' never sees ACTUAL so far, since we don't have a WORKING/ACTUAL
keyword (yet). So you'd have to say:

 cat file > a.now
 svn cat file [-r BASE] > a.old
 diff -u a.old a.now

:)

~Neels

Received on 2010-01-29 16:30:18 CET

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