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

Re: deleted-with-history [sic] after merge

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 24 Mar 2008 11:46:44 +0100

On Mon, Mar 24, 2008 at 09:40:53AM +0100, Erik Huelsmann wrote:
> > copied:
> > A boolean: true if this entry was added with history; only allowed
> > when schedule is add. (### Why aren't the copyfrom attributes
> > enough for this?)
>
> This is plain wrong: files which are part of a
> schedule-add-with-history subtree are marked schedule-normal, but have
> the 'copied' flag. (Not that I actually like this design, but that's
> how it is now.)

Shouldn't the README be updated then?

Index: subversion/libsvn_wc/README
===================================================================
--- subversion/libsvn_wc/README (revision 30014)
+++ subversion/libsvn_wc/README (working copy)
@@ -423,8 +423,9 @@ prop-reject-file:
 
 copied:
    A boolean: true if this entry was added with history; only allowed
- when schedule is add. (### Why aren't the copyfrom attributes
- enough for this?)
+ when schedule is add or for files which are marked as schedule-normal
+ as part of a schedule-add-with-history subtree. (### Why aren't the
+ copyfrom attributes enough for this?)
 
 copyfrom-url:
    If this entry is added with history, the URL of the copy source.

I left the question marked with ### in place, cause I don't know the answer.
But maybe we could clarify that in the same go?

-- 
Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

  • application/pgp-signature attachment: stored
Received on 2008-03-24 11:45:49 CET

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