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

Re: #3334: schedule a WC item for re-add when tree-conflicted - help please!

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 14 Jan 2009 14:38:44 +0000

Julian Foad wrote:
> Julian Foad wrote:
> It doesn't matter that I'm replying to myself: the conversation is still
> helpful.
>
> OK, my little test is revealing exactly what I needed to know, using the
> directory tree 'A' in the 'greek tree' as the subject.
>
> Differences between 'New scenario' (tree conflict) and 'Existing
> scenario' (manual copy):
>
> In A/.svn/entries:
>
> THIS_DIR:
> revision = 2 (New) 1 (Existing)
>
> B:
> C:
> D:
> copied = false (New) true (Existing)
>
> mu:
> revision = 1 (New) None (meaning THIS_DIR's, i.e. 1) (Existing)
>
> In A/B/.svn/entries:
>
> E:
> F:
> copied = false (New) true (Existing)
>
>
> OK, so I'm supposed to set 'copied' on all entries, not only (for dirs)
> on the 'this_dir' entry. My bad.

Fixed on the branch in r35234.

> As for A's 'revision' ... that's unexpected, to me. A's parent is at r2,
> in which 'A' does not exist, and in that entries file the entry for 'A'
> has no revision, meaning r2.
>
> I don't understand the inconsistency, and suspect that it "just works",
> so I'll try replicating it.

This 'revision = 1' most definitely is needed: without it, 'svn st -u'
fails, saying 'A' does not exist in the repository. Fixing...

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1024241
Received on 2009-01-14 15:39:12 CET

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