Stefan Sperling wrote on Wed, 8 Oct 2008 at 15:13 +0100:
> On Wed, Oct 08, 2008 at 03:55:55PM +0200, Daniel Shahaf wrote:
> >
> > My shell session went like this...
> >
> > > % rd/s/q commit-access-templates
> > >
> > > % svn up -q
> > >
> > > % cd commit-access-templates
> > >
> > > % svn ps svn:externals "^/trunk/README myreadme" .
> > > property 'svn:externals' set on '.'
> > >
> > > % svn up
> > >
> > > Fetching external item into 'myreadme'
> > > E myreadme
> > > C .
> > > Updated external to revision 33544.
> > >
> >
> > Huh? 'svn help up' says that 'E' means 'Existed'. And it certainly
> > didn't exist. I suggest to use 'X' for new externals.
>
> Could it be that there already is some information about
> myreadme in the entries file?
>
My session started with 'rd/s/q', which is the equivalent of 'rm -rf'.
Therefore, there couldn't have been any information in the entries file
beyond what the commands in the transcript created.
Daniel
> This would explain the following:
>
> > And why does it report a conflict on '.'?
>
> I guess because the tree-conflict code treats this
> situation as an obstruction. Apparently tree conflicts and
> file externals need to be harmonised...
>
> Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-08 17:04:03 CEST