Thanks so much for the clarification. This is both interesting and helpful.
-----Original Message-----
From: Daniel Becroft [mailto:djcbecroft_at_gmail.com]
Sent: Thursday, June 24, 2010 5:32 PM
To: Ring, Nolan
Cc: bert_at_qqmail.nl; users_at_subversion.apache.org
Subject: Re: <file-name>.svn-revert files under .svn/prop-base directory ...
On Fri, Jun 25, 2010 at 4:42 AM, <Ring_Nolan_at_emc.com> wrote:
> Thanks so much for your quick response.
>
> I'm not sure I understand what you're saying. :-( When would a file.svn-revert file be created for the "file" example below? On a merge? A regular commit following modifications? Does anything in the logs distinguish these files? And would I expect the file.svn-revert file to be there for the life of the working copy?
In the example below, the .svn-revert file gets created as a result of
either of the 'svn cp' operations. It represents what 'file' looked
like before the 'svn rm file' command. Normally, the .svn-base file
represents 'file' exactly as it exists in the repository at the point
of checkout/update. It is this .svn-base file is used when performing
an 'svn revert'. However, the 'svn cp' command changes the .svn-base
to be that of the copy-source. The .svn-revert is the original base of
the file that was removed.
For example:
svn checkout > creates file.svn-base
svn rm file
svn cp other-file file <<-- copies file.svn-base to file.svn-revert,
and other-file.svn-base to file.svn-base
AFAIK, the .svn-revert will only be there whilst the revert action is
possible. Once you perform either 'svn commit' or 'svn revert', the
.svn-revert file will be removed (since .svn-base is sufficient).
Interestingly, the .svn-revert file under prop-base is *always*
created, even if there was no previous .svn-base file.
Disclaimer: I'm not a Subversion developer - I'm sure someone here can
explain it much clearer than I. :-)
> -----Original Message-----
> From: Bert Huijben [mailto:bert_at_qqmail.nl]
> Sent: Thursday, June 24, 2010 1:37 PM
> To: Ring, Nolan; users_at_subversion.apache.org
> Subject: RE: <file-name>.svn-revert files under .svn/prop-base directory ...
>
>> -----Original Message-----
>> From: Ring_Nolan_at_emc.com [mailto:Ring_Nolan_at_emc.com]
>> Sent: donderdag 24 juni 2010 14:43
>> To: users_at_subversion.apache.org
>> Subject: <file-name>.svn-revert files under .svn/prop-base directory
>> ...
>>
>> All,
>>
>> I'm wondering under what circumstances does a <file-name>.svn-revert
>> file get created under the .svn/prop-base directory.
>
> When a file is replaced by a different file, where that last file has an
> history. In this case wc-1.0 needs one additional level of history.
>
> E.g.
> svn rm file
> svn cp other-file file
> or svn cp URL_at_rev file
>
> This feature was actually added in Subversion 1.4. Before that you would get
> an error that you had to commit the delete before adding a new file with
> history.
>
> (And in Subversion 1.7 this will be handled in a completely different way as
> part of the WC-NG work)
>
> Bert
>
>
>
>
Received on 2010-06-25 13:34:59 CEST