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

Re: bug round 2

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-12-06 17:53:00 CET

cmpilato@collab.net writes:

> Philip, I'm having a brain-O moment right now. I've been looking at
> this recipe for a bit this morning, and I can't figure out why you've
> deemed ra_local corrent, and ra_dav incorrect, in this case? Can you
> ignore the fact that I *should* be able to understand this stuff, and
> tell me anyway? :-) Thanks.

As I said in another mail, the rules for mixed revision working copies
are to a certain extent arbitrary. So the classification as
correct/incorrect is just my interpretation of our (unwritten?) rules.

As I understand it we can add additional files or sub-directories to a
directory that is out of date, assuming the additional items don't
cause conflicts with HEAD. We can also delete files and
sub-directories from an out of date directory, provided the items
being deleted are up to date.

We cannot modify properties on a directory that is out of date, and we
cannot delete a file or directory that is out of date.

The point at which I think the sequence below should fail is when we
attempt to delete dir1 when it is out of date.

> > svn mv wc/dir1 wc/newdir
> > svn ci -m "mv" wc
> >
> > Over ra_local I get
> >
> > ...
> > Committed revision 4.
> > A wc/newdir/dir1
> > D wc/dir1/dir2/file2
> > D wc/dir1/dir2
> > D wc/dir1
> > Deleting wc/dir1
> > svn: Transaction is out of date
> > svn: Commit failed (details follow):
> > svn: out of date: `dir1' in txn `5'
> >
> > as expected, but over ra_dav I get
> >
> > ...
> > Committed revision 4.
> > A wc/newdir/dir1
> > D wc/dir1/dir2/file2
> > D wc/dir1/dir2
> > D wc/dir1
> > Deleting wc/dir1
> > Adding wc/newdir/dir1
> > Adding wc/newdir/dir1/dir2/file2
> >
> > Committed revision 5.
> >
> > In both cases (ra_dav and ra_local) the working copy before the move
> > looks like
> >
> > 0 0 ? wc
> > 1 1 anonymous wc/dir1
> > 1 1 anonymous wc/dir1/dir2
> > 3 3 anonymous wc/dir1/dir2/file2
> > 4 4 anonymous wc/newdir
> > Head revision: 4

Here wc/dir1 is being deleted and yet it is out of date. The HEAD
revision may contain items that have never been updated/created in
this working copy.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 6 17:53:42 2002

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