You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <d....@daniel.shahaf.name> on 2008/10/08 13:55:55 UTC
Problems with file externals
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.
And why does it report a conflict on '.'?
> Updated to revision 33544.
>
> % svn st
> M .
> X myreadme
>
Okay, it's here. Now let's remove it, the same way it was pulled in:
> % svn pd svn:externals .
> property 'svn:externals' deleted from '.'.
>
> % svn up
> At revision 33544.
>
It should be gone now. But it isn't:
> % svn st
> X myreadme
>
> % ls myreadme
> myreadme
>
Let's try to remove it anyway:
> % del myreadme
>
> % svn st
> ! X myreadme
>
> % svn revert -R . myreadme
> Reverted 'myreadme'
>
> % svn st
> X myreadme
>
How do I get rid of it?
> %
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Problems with file externals
Posted by Daniel Shahaf <da...@shahaf.name>.
Anyone? Blair?
I can still reproduce this behaviour with HEAD; changes since the
previous transcript are noted below.
Daniel Shahaf wrote on Wed, 8 Oct 2008 at 15:55 +0200:
>
> My shell session went like this...
>
> > % rd/s/q commit-access-templates
> >
(that's in my svn trunk wc, yes?)
> > % 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
[snip conflict 'C .' line, since HEAD doesn't print it ]
> > 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.
>
[ snipped question about the conflict line which isn't printed now ]
> > Updated to revision 33544.
> >
> > % svn st
> > M .
> > X myreadme
> >
>
> Okay, it's here. Now let's remove it, the same way it was pulled in:
>
> > % svn pd svn:externals .
> > property 'svn:externals' deleted from '.'.
> >
> > % svn up
> > At revision 33544.
> >
>
> It should be gone now. But it isn't:
>
> > % svn st
> > X myreadme
> >
> > % ls myreadme
> > myreadme
> >
>
> Let's try to remove it anyway:
>
I also tried 'svn rm', see below.
> > % del myreadme
> >
% svn rm myreadme
..\..\..\subversion\libsvn_wc\adm_ops.c:1151: (apr_err=155030)
svn: Cannot remove the file external at 'myreadme'; please propedit or propdel the svn:externals description that created it
> > % svn st
> > ! X myreadme
> >
> > % svn revert -R . myreadme
> > Reverted 'myreadme'
> >
> > % svn st
> > X myreadme
> >
>
And my question remains:
> How do I get rid of it?
>
> > %
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Problems with file externals
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Filed issue #3351.
http://subversion.tigris.org/issues/show_bug.cgi?id=3351
Daniel
Daniel Shahaf wrote on Wed, 8 Oct 2008 at 15:55 +0200:
>
> 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.
>
> And why does it report a conflict on '.'?
>
> > Updated to revision 33544.
> >
> > % svn st
> > M .
> > X myreadme
> >
>
> Okay, it's here. Now let's remove it, the same way it was pulled in:
>
> > % svn pd svn:externals .
> > property 'svn:externals' deleted from '.'.
> >
> > % svn up
> > At revision 33544.
> >
>
> It should be gone now. But it isn't:
>
> > % svn st
> > X myreadme
> >
> > % ls myreadme
> > myreadme
> >
>
> Let's try to remove it anyway:
>
> > % del myreadme
> >
> > % svn st
> > ! X myreadme
> >
> > % svn revert -R . myreadme
> > Reverted 'myreadme'
> >
> > % svn st
> > X myreadme
> >
>
> How do I get rid of it?
>
> > %
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=992268
Re: Problems with file externals
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Problems with file externals
Posted by Stefan Sperling <st...@elego.de>.
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?
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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Problems with file externals
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
On Wed, 08 Oct 2008 15:13:59 +0100, "Julian Foad"
<ju...@btopenworld.com> said:
> On Wed, 2008-10-08 at 15:55 +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.
> >
> > And why does it report a conflict on '.'?
>
> Could you run "svn info ." at this stage and see what sort of conflict
> it's reporting. Maybe the tree-conflict code is kicking in erroneously.
>
> - Julian
>
It doesn't report any conflict:
% svn st
M .
X myreadme
% svn info .
Path: .
URL:
file:///Data/Unzip/svn/mirror/svn/trunk/notes/commit-access-templates
Repository Root: file:///Data/Unzip/svn/mirror/svn
Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Revision: 33545
Node Kind: directory
Schedule: normal
Last Changed Author: lgo
Last Changed Rev: 31626
Last Changed Date: 2008-06-08 10:32:20 +0300 (Sun, 08 Jun 2008)
%
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Problems with file externals
Posted by Julian Foad <ju...@btopenworld.com>.
On Wed, 2008-10-08 at 15:55 +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.
>
> And why does it report a conflict on '.'?
Could you run "svn info ." at this stage and see what sort of conflict
it's reporting. Maybe the tree-conflict code is kicking in erroneously.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org