You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Miller, Eric" <Er...@amd.com> on 2008/01/09 18:02:17 UTC
Bug with missing scheduled-for-delete dir
I think this is another working copy bug. Could someone test this under
1.5?
Synopsis: A scheduled-for-delete path is removed via system command or
3rd party application. Depending on the contents of the working copy,
this may not be recoverable using svn commands.
Recipe using 1.4.4:
svnadmin create repos
svn co file://`pwd`/repos wc
touch wc/afile
mkdir -p wc/dir/subdir
svn add wc/*
svn ci -m '' wc
svn up -N wc
svn lock wc/afile
svn rm wc/dir
mkdir wc/dir2
rm -rf wc/dir
Now we are somewhat hosed:
% svn up wc/dir
svn: Directory 'wc/dir' is missing
% svn up -N wc/dir
svn: Directory 'wc/dir' is missing
% svn st -N wc
? wc/dir2
K wc/afile
D wc/dir
% svn st -N -u wc
! ? wc/dir
? wc/dir2
K 1 wc/afile
Status against revision: 1
But... oddly enough we can remove the blockage:
% svn unlock wc/afile
'afile' unlocked.
And then through some trickery, restore the path:
% svn up -N wc/dir
D wc/dir
Updated to revision 1.
% svn up -N wc/dir
A wc/dir
Updated to revision 1.
All is well:
% svn st -u wc
? wc/dir2
Status against revision: 1
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: Bug with missing scheduled-for-delete dir
Posted by "Miller, Eric" <Er...@amd.com>.
I should note that before the unlock, status on the missing path gives
some bizarro errors:
% svn st -u wc/dir
svn: Working copy path 'dir/afile' does not exist in repository
This is what gave me the clue to unlock afile.
>
> But... oddly enough we can remove the blockage:
> % svn unlock wc/afile
> 'afile' unlocked.
>
> And then through some trickery, restore the path:
> % svn up -N wc/dir
> D wc/dir
> Updated to revision 1.
>
> % svn up -N wc/dir
> A wc/dir
> Updated to revision 1.
>
> All is well:
> % svn st -u wc
> ? wc/dir2
> Status against revision: 1
Eric
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: Bug with missing scheduled-for-delete dir
Posted by "Miller, Eric" <Er...@amd.com>.
> Eric, my #1 goal for Subversion in 2008 is to rewrite the working copy
> support to make the metadata far far far more robust.
Awesome! Is there anything like the sparse working copy spec that I
could peruse, or is it too early yet?
> And yes, I did type in your script, and ran it enough to determine
> that "svn up wc" fixed your problem in this case.
Thank you, but the bug is demonstrated with "svn up -N wc/dir". Does
that work for you?
Thanks,
Eric
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Bug with missing scheduled-for-delete dir
Posted by David Glasser <gl...@davidglasser.net>.
On Jan 9, 2008 4:56 PM, Miller, Eric <Er...@amd.com> wrote:
> > > I provided such a nice little recipe - can no one run a quick check
> > > using a 1.5 client?
>
> > So, we're grateful for the recipe, but we don't need the attitude.
>
> I didn't mean it to came off that way, but be honest - it took you and
> David far longer to type up the replies than it would have to simply cut
> and paste the recipe and responded with a yay or nay.
>
> With respect to the "disappointed" comment - well... That's because it
> is unfortunate that more people don't seem to care about the robustness
> of the meta-data scheme. For me it causes *severe* headaches on a daily
> basis.
Eric, my #1 goal for Subversion in 2008 is to rewrite the working copy
support to make the metadata far far far more robust.
Before I can do that, I need to get trunk (merge tracking) into a
finished enough shape that it makes sense to be making these sorts of
major new features.
In fact, most of the current developers are distracted by the
merge-tracking/1.5-release madness, which has a lot of work left to be
done.
Trust me, nobody likes the current working copy/metadata code. It's
the next Big Thing to fix. But we've gotta get there first.
And yes, I did type in your script, and ran it enough to determine
that "svn up wc" fixed your problem in this case.
And yes, I do care about tools deleting subdirectories. The only post
on my blog that has any significant number of comments (and still gets
linked from random places all the time) is
http://www.davidglasser.net/point/2006/07/30/using-omnigraffle-with-subversion-without-sadness/
which is about how to teach OmniGraffle to not clobber subdirectories.
And if you scroll down you'll even see the comment from the 3rd-party
tool author saying they added a feature to make avoiding this easier
:)
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: Bug with missing scheduled-for-delete dir
Posted by "Miller, Eric" <Er...@amd.com>.
> > I provided such a nice little recipe - can no one run a quick check
> > using a 1.5 client?
> So, we're grateful for the recipe, but we don't need the attitude.
I didn't mean it to came off that way, but be honest - it took you and
David far longer to type up the replies than it would have to simply cut
and paste the recipe and responded with a yay or nay.
With respect to the "disappointed" comment - well... That's because it
is unfortunate that more people don't seem to care about the robustness
of the meta-data scheme. For me it causes *severe* headaches on a daily
basis.
Anyways - let's leave that alone and focus on the issue at hand if
possible.
A fix for the bug that Brane listed certainly would help matters but
that issue is over 5 years old. This issue should be several orders of
magnitude easier to address. Who knows - maybe if all of these
incremental issues are addressed, then maybe #707 will become obsolete?
All I'm looking for is to have confirmation of the bug and I can submit
an issue on it. If someone thinks it would be trivial for them to fix
then a big fat TIA! Otherwise, I'll just hack on the .svn/entries file
and try to take a look at the source code when I have time.
Thanks!
Eric
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Bug with missing scheduled-for-delete dir
Posted by Karl Fogel <kf...@red-bean.com>.
"Miller, Eric" <Er...@amd.com> writes:
> I provided such a nice little recipe - can no one run a quick check
> using a 1.5 client?
Eric, most people here are volunteers. In fact, all are to some
degree or another, since even the people who work on Subversion at
their day job tend to also do it in their off hours :-).
*Everything* gets triaged, because everyone has more to do than there
is time for. (The price of success, I guess.) It's too bad you're
not set up to test this with the 1.5 development sources yourself, but
we don't blame you for it -- our request for your time does not confer
any obligation on you!
But by the same token, your repeated barbed comments (like the one
above, and the earlier one about our "attitude") are not justified.
We have hundreds of emails to read and issues to look into. All of
this is publicly visible, in our mail archives and bug tracker. We're
doing what we can.
So, we're grateful for the recipe, but we don't need the attitude.
Thanks,
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Bug with missing scheduled-for-delete dir
Posted by Nathan Kidd <na...@spicycrypto.ca>.
Miller, Eric wrote:
> I provided such a nice little recipe - can no one run a quick check
> using a 1.5 client?
The TortoiseSVN provides a nightly 1.5 win32 build of svn.exe, if you
are able to test on Windows.
http://nightlybuilds.tortoisesvn.net/latest/win32/svn.exe
-Nathan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: Bug with missing scheduled-for-delete dir
Posted by "Miller, Eric" <Er...@amd.com>.
> It has *never* been correct to delete or move Subversion's
> version-controlled files without using a Subversion client. I hope a
> future wc rewrite relaxes that, but for now, that's the breaks.
I hope that too. I am disappointed in the "that's the breaks" attitude.
>> It seems trivial to remove the scheduled-for-deletion flag and just
mark
>> it as missing.
> That seems wrong. If you said "svn rm foo" and haven't committed it
> yet or done a revert, why should it stop being scheduled for deletion?
Upon further thought I agree, missing would not be accurate.
As far as I can tell there are multiple bugs here:
1. status shows 'D' without -u and '!' with -u.
FIX: They both should show the same thing, though -u might show '*'.
2. status on the missing path fails with a completely screwy message.
FIX: I have no idea, something is very wrong here. 'afile' is in the
wc_root, but is reported as dir/afile.
3. update on the missing path fails uselessly depending on the contents
of the parent.
FIX: Why does it matter if the wc_root has a locked file or not?
Something is very messed up here.
4. revert fails with "Failed to revert 'wc/dir' -- try updating
instead."
FIX: Actually this is probably fine, as long as update worked.
I provided such a nice little recipe - can no one run a quick check
using a 1.5 client?
Thanks,
Eric
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Bug with missing scheduled-for-delete dir
Posted by Steven Bakke <st...@amd.com>.
On Jan 9, 2008, at 3:38 PM, Branko Čibej wrote:
> Steven Bakke wrote:
>>
>> On Jan 9, 2008, at 2:08 PM, David Glasser wrote:
>>
>>> On Jan 9, 2008 1:44 PM, Miller, Eric <Er...@amd.com> wrote:
>>>>> To be honest, I think the answer to "but I deleted all the
>>>>> metadata
>>>>> outside the scope of svn" is "don't do that".
>>>>
>>>> Sure, I'll get right on the phone and tell our 3rd party tool
>>>> developer
>>>> to stop removing the meta-data when they manipulate the database...
>>>> right.
>>>
>>> It has *never* been correct to delete or move Subversion's
>>> version-controlled files without using a Subversion client. I
>>> hope a
>>> future wc rewrite relaxes that, but for now, that's the breaks.
>>
>> Yes, so until subversion is fixed such that it isn't so intrusive
>> within the working copy,
>> it would be nice to put in a simple patch to allow people to make
>> progress. Even
>> if the metadata weren't sprinkled about the working copy
>> everywhere, there would still
>> be problems because the working copy is extremely fragile in its
>> current state. External
>> tools just magnify the issue. I don't like the fact that it
>> apparently was not a design
>> goal for the working copy to be robust and tolerant of error
>> conditions. If you compare it
>> to CVS, it is vastly more complex and is much easier to break.
>>
>> So until the whole thing is re-written to be robust, it would be
>> nice to patch the bugs. Not
>> everybody uses subversion to control text source code.
>
> So you want to implement http://subversion.tigris.org/issues/show_bug.cgi?id=707
> Be my guest, patches are always welcome.
>
> Until then, posts like yours that sort of imply we're morons are not.
>
I wasn't trying to imply that the developers are morons. I've just
been frustrated with the experience I've
had tracking down strange working copy bugs. Sorry for the rant... it
feels like a Monday.
_Steve
> -- Brane
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Bug with missing scheduled-for-delete dir
Posted by Branko Čibej <br...@xbc.nu>.
Steven Bakke wrote:
>
> On Jan 9, 2008, at 2:08 PM, David Glasser wrote:
>
>> On Jan 9, 2008 1:44 PM, Miller, Eric <Er...@amd.com> wrote:
>>>> To be honest, I think the answer to "but I deleted all the metadata
>>>> outside the scope of svn" is "don't do that".
>>>
>>> Sure, I'll get right on the phone and tell our 3rd party tool developer
>>> to stop removing the meta-data when they manipulate the database...
>>> right.
>>
>> It has *never* been correct to delete or move Subversion's
>> version-controlled files without using a Subversion client. I hope a
>> future wc rewrite relaxes that, but for now, that's the breaks.
>
> Yes, so until subversion is fixed such that it isn't so intrusive
> within the working copy,
> it would be nice to put in a simple patch to allow people to make
> progress. Even
> if the metadata weren't sprinkled about the working copy everywhere,
> there would still
> be problems because the working copy is extremely fragile in its
> current state. External
> tools just magnify the issue. I don't like the fact that it
> apparently was not a design
> goal for the working copy to be robust and tolerant of error
> conditions. If you compare it
> to CVS, it is vastly more complex and is much easier to break.
>
> So until the whole thing is re-written to be robust, it would be nice
> to patch the bugs. Not
> everybody uses subversion to control text source code.
So you want to implement
http://subversion.tigris.org/issues/show_bug.cgi?id=707
Be my guest, patches are always welcome.
Until then, posts like yours that sort of imply we're morons are not.
-- Brane
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Bug with missing scheduled-for-delete dir
Posted by Steven Bakke <st...@amd.com>.
On Jan 9, 2008, at 2:08 PM, David Glasser wrote:
> On Jan 9, 2008 1:44 PM, Miller, Eric <Er...@amd.com> wrote:
>>> To be honest, I think the answer to "but I deleted all the metadata
>>> outside the scope of svn" is "don't do that".
>>
>> Sure, I'll get right on the phone and tell our 3rd party tool
>> developer
>> to stop removing the meta-data when they manipulate the database...
>> right.
>
> It has *never* been correct to delete or move Subversion's
> version-controlled files without using a Subversion client. I hope a
> future wc rewrite relaxes that, but for now, that's the breaks.
Yes, so until subversion is fixed such that it isn't so intrusive
within the working copy,
it would be nice to put in a simple patch to allow people to make
progress. Even
if the metadata weren't sprinkled about the working copy everywhere,
there would still
be problems because the working copy is extremely fragile in its
current state. External
tools just magnify the issue. I don't like the fact that it
apparently was not a design
goal for the working copy to be robust and tolerant of error
conditions. If you compare it
to CVS, it is vastly more complex and is much easier to break.
So until the whole thing is re-written to be robust, it would be nice
to patch the bugs. Not
everybody uses subversion to control text source code.
>
>
>> "Could someone test this under 1.5?" Please? I don't have ready
>> access
>> to a compiled version.
>>
>> If it still fails then can I/someone file a bug or whip out a quick
>> patch?
>> It seems trivial to remove the scheduled-for-deletion flag and just
>> mark
>> it as missing.
>
> That seems wrong. If you said "svn rm foo" and haven't committed it
> yet or done a revert, why should it stop being scheduled for deletion?
>
> --dave
>
> --
> David Glasser | glasser@davidglasser.net | http://
> www.davidglasser.net/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Bug with missing scheduled-for-delete dir
Posted by David Glasser <gl...@davidglasser.net>.
On Jan 9, 2008 1:44 PM, Miller, Eric <Er...@amd.com> wrote:
> > To be honest, I think the answer to "but I deleted all the metadata
> > outside the scope of svn" is "don't do that".
>
> Sure, I'll get right on the phone and tell our 3rd party tool developer
> to stop removing the meta-data when they manipulate the database...
> right.
It has *never* been correct to delete or move Subversion's
version-controlled files without using a Subversion client. I hope a
future wc rewrite relaxes that, but for now, that's the breaks.
> "Could someone test this under 1.5?" Please? I don't have ready access
> to a compiled version.
>
> If it still fails then can I/someone file a bug or whip out a quick
> patch?
> It seems trivial to remove the scheduled-for-deletion flag and just mark
> it as missing.
That seems wrong. If you said "svn rm foo" and haven't committed it
yet or done a revert, why should it stop being scheduled for deletion?
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: Bug with missing scheduled-for-delete dir
Posted by "Miller, Eric" <Er...@amd.com>.
> To be honest, I think the answer to "but I deleted all the metadata
> outside the scope of svn" is "don't do that".
Sure, I'll get right on the phone and tell our 3rd party tool developer
to stop removing the meta-data when they manipulate the database...
right.
"Could someone test this under 1.5?" Please? I don't have ready access
to a compiled version.
If it still fails then can I/someone file a bug or whip out a quick
patch?
It seems trivial to remove the scheduled-for-deletion flag and just mark
it as missing.
Eric
> -----Original Message-----
> From: dglasser@gmail.com [mailto:dglasser@gmail.com] On Behalf Of
David
> Glasser
> Sent: Wednesday, January 09, 2008 11:40 AM
> To: Miller, Eric
> Cc: dev@subversion.tigris.org
> Subject: Re: Bug with missing scheduled-for-delete dir
>
> To be honest, I think the answer to "but I deleted all the metadata
> outside the scope of svn" is "don't do that".
>
> Now, would life be better if the metadata was all in one place and not
> scattered everywhere? Yup, and we hope to fix that in a future
> version. But until then, I'm not sure how much it's worth it to fix
> this sort of issue...
>
> --dave
>
> On Jan 9, 2008 1:14 PM, Miller, Eric <Er...@amd.com> wrote:
> > Yes, but I have other things I don't want updated... the working
copy is
> > huge and I only want that one sub-path updated.
> >
> >
> > > -----Original Message-----
> > > From: dglasser@gmail.com [mailto:dglasser@gmail.com] On Behalf Of
> > David
> > > Glasser
> > > Sent: Wednesday, January 09, 2008 11:12 AM
> > > To: Miller, Eric
> > > Cc: dev@subversion.tigris.org
> > > Subject: Re: Bug with missing scheduled-for-delete dir
> > >
> > > Doesn't "svn up wc" work?
> > >
> > > --dave
> > >
> > > On Jan 9, 2008 1:02 PM, Miller, Eric <Er...@amd.com> wrote:
> > > > I think this is another working copy bug. Could someone test
this
> > under
> > > > 1.5?
> > > >
> > > > Synopsis: A scheduled-for-delete path is removed via system
command
> > or
> > > > 3rd party application. Depending on the contents of the working
> > copy,
> > > > this may not be recoverable using svn commands.
> > > >
> > > > Recipe using 1.4.4:
> > > > svnadmin create repos
> > > > svn co file://`pwd`/repos wc
> > > > touch wc/afile
> > > > mkdir -p wc/dir/subdir
> > > > svn add wc/*
> > > > svn ci -m '' wc
> > > > svn up -N wc
> > > > svn lock wc/afile
> > > > svn rm wc/dir
> > > > mkdir wc/dir2
> > > > rm -rf wc/dir
> > > >
> > > > Now we are somewhat hosed:
> > > > % svn up wc/dir
> > > > svn: Directory 'wc/dir' is missing
> > > >
> > > > % svn up -N wc/dir
> > > > svn: Directory 'wc/dir' is missing
> > > >
> > > > % svn st -N wc
> > > > ? wc/dir2
> > > > K wc/afile
> > > > D wc/dir
> > > >
> > > > % svn st -N -u wc
> > > > ! ? wc/dir
> > > > ? wc/dir2
> > > > K 1 wc/afile
> > > > Status against revision: 1
> > > >
> > > > But... oddly enough we can remove the blockage:
> > > > % svn unlock wc/afile
> > > > 'afile' unlocked.
> > > >
> > > > And then through some trickery, restore the path:
> > > > % svn up -N wc/dir
> > > > D wc/dir
> > > > Updated to revision 1.
> > > >
> > > > % svn up -N wc/dir
> > > > A wc/dir
> > > > Updated to revision 1.
> > > >
> > > > All is well:
> > > > % svn st -u wc
> > > > ? wc/dir2
> > > > Status against revision: 1
> > > >
> > > >
> > > >
> >
---------------------------------------------------------------------
> > > > To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> > > > For additional commands, e-mail: dev-help@subversion.tigris.org
> > > >
> > > >
> > >
> > >
> > >
> > > --
> > > David Glasser | glasser@davidglasser.net |
> > http://www.davidglasser.net/
> > >
> >
> >
> >
> >
>
>
>
> --
> David Glasser | glasser@davidglasser.net |
http://www.davidglasser.net/
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Bug with missing scheduled-for-delete dir
Posted by David Glasser <gl...@davidglasser.net>.
To be honest, I think the answer to "but I deleted all the metadata
outside the scope of svn" is "don't do that".
Now, would life be better if the metadata was all in one place and not
scattered everywhere? Yup, and we hope to fix that in a future
version. But until then, I'm not sure how much it's worth it to fix
this sort of issue...
--dave
On Jan 9, 2008 1:14 PM, Miller, Eric <Er...@amd.com> wrote:
> Yes, but I have other things I don't want updated... the working copy is
> huge and I only want that one sub-path updated.
>
>
> > -----Original Message-----
> > From: dglasser@gmail.com [mailto:dglasser@gmail.com] On Behalf Of
> David
> > Glasser
> > Sent: Wednesday, January 09, 2008 11:12 AM
> > To: Miller, Eric
> > Cc: dev@subversion.tigris.org
> > Subject: Re: Bug with missing scheduled-for-delete dir
> >
> > Doesn't "svn up wc" work?
> >
> > --dave
> >
> > On Jan 9, 2008 1:02 PM, Miller, Eric <Er...@amd.com> wrote:
> > > I think this is another working copy bug. Could someone test this
> under
> > > 1.5?
> > >
> > > Synopsis: A scheduled-for-delete path is removed via system command
> or
> > > 3rd party application. Depending on the contents of the working
> copy,
> > > this may not be recoverable using svn commands.
> > >
> > > Recipe using 1.4.4:
> > > svnadmin create repos
> > > svn co file://`pwd`/repos wc
> > > touch wc/afile
> > > mkdir -p wc/dir/subdir
> > > svn add wc/*
> > > svn ci -m '' wc
> > > svn up -N wc
> > > svn lock wc/afile
> > > svn rm wc/dir
> > > mkdir wc/dir2
> > > rm -rf wc/dir
> > >
> > > Now we are somewhat hosed:
> > > % svn up wc/dir
> > > svn: Directory 'wc/dir' is missing
> > >
> > > % svn up -N wc/dir
> > > svn: Directory 'wc/dir' is missing
> > >
> > > % svn st -N wc
> > > ? wc/dir2
> > > K wc/afile
> > > D wc/dir
> > >
> > > % svn st -N -u wc
> > > ! ? wc/dir
> > > ? wc/dir2
> > > K 1 wc/afile
> > > Status against revision: 1
> > >
> > > But... oddly enough we can remove the blockage:
> > > % svn unlock wc/afile
> > > 'afile' unlocked.
> > >
> > > And then through some trickery, restore the path:
> > > % svn up -N wc/dir
> > > D wc/dir
> > > Updated to revision 1.
> > >
> > > % svn up -N wc/dir
> > > A wc/dir
> > > Updated to revision 1.
> > >
> > > All is well:
> > > % svn st -u wc
> > > ? wc/dir2
> > > Status against revision: 1
> > >
> > >
> > >
> ---------------------------------------------------------------------
> > > To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> > > For additional commands, e-mail: dev-help@subversion.tigris.org
> > >
> > >
> >
> >
> >
> > --
> > David Glasser | glasser@davidglasser.net |
> http://www.davidglasser.net/
> >
>
>
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: Bug with missing scheduled-for-delete dir
Posted by "Miller, Eric" <Er...@amd.com>.
Yes, but I have other things I don't want updated... the working copy is
huge and I only want that one sub-path updated.
> -----Original Message-----
> From: dglasser@gmail.com [mailto:dglasser@gmail.com] On Behalf Of
David
> Glasser
> Sent: Wednesday, January 09, 2008 11:12 AM
> To: Miller, Eric
> Cc: dev@subversion.tigris.org
> Subject: Re: Bug with missing scheduled-for-delete dir
>
> Doesn't "svn up wc" work?
>
> --dave
>
> On Jan 9, 2008 1:02 PM, Miller, Eric <Er...@amd.com> wrote:
> > I think this is another working copy bug. Could someone test this
under
> > 1.5?
> >
> > Synopsis: A scheduled-for-delete path is removed via system command
or
> > 3rd party application. Depending on the contents of the working
copy,
> > this may not be recoverable using svn commands.
> >
> > Recipe using 1.4.4:
> > svnadmin create repos
> > svn co file://`pwd`/repos wc
> > touch wc/afile
> > mkdir -p wc/dir/subdir
> > svn add wc/*
> > svn ci -m '' wc
> > svn up -N wc
> > svn lock wc/afile
> > svn rm wc/dir
> > mkdir wc/dir2
> > rm -rf wc/dir
> >
> > Now we are somewhat hosed:
> > % svn up wc/dir
> > svn: Directory 'wc/dir' is missing
> >
> > % svn up -N wc/dir
> > svn: Directory 'wc/dir' is missing
> >
> > % svn st -N wc
> > ? wc/dir2
> > K wc/afile
> > D wc/dir
> >
> > % svn st -N -u wc
> > ! ? wc/dir
> > ? wc/dir2
> > K 1 wc/afile
> > Status against revision: 1
> >
> > But... oddly enough we can remove the blockage:
> > % svn unlock wc/afile
> > 'afile' unlocked.
> >
> > And then through some trickery, restore the path:
> > % svn up -N wc/dir
> > D wc/dir
> > Updated to revision 1.
> >
> > % svn up -N wc/dir
> > A wc/dir
> > Updated to revision 1.
> >
> > All is well:
> > % svn st -u wc
> > ? wc/dir2
> > Status against revision: 1
> >
> >
> >
---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> > For additional commands, e-mail: dev-help@subversion.tigris.org
> >
> >
>
>
>
> --
> David Glasser | glasser@davidglasser.net |
http://www.davidglasser.net/
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Bug with missing scheduled-for-delete dir
Posted by David Glasser <gl...@davidglasser.net>.
Doesn't "svn up wc" work?
--dave
On Jan 9, 2008 1:02 PM, Miller, Eric <Er...@amd.com> wrote:
> I think this is another working copy bug. Could someone test this under
> 1.5?
>
> Synopsis: A scheduled-for-delete path is removed via system command or
> 3rd party application. Depending on the contents of the working copy,
> this may not be recoverable using svn commands.
>
> Recipe using 1.4.4:
> svnadmin create repos
> svn co file://`pwd`/repos wc
> touch wc/afile
> mkdir -p wc/dir/subdir
> svn add wc/*
> svn ci -m '' wc
> svn up -N wc
> svn lock wc/afile
> svn rm wc/dir
> mkdir wc/dir2
> rm -rf wc/dir
>
> Now we are somewhat hosed:
> % svn up wc/dir
> svn: Directory 'wc/dir' is missing
>
> % svn up -N wc/dir
> svn: Directory 'wc/dir' is missing
>
> % svn st -N wc
> ? wc/dir2
> K wc/afile
> D wc/dir
>
> % svn st -N -u wc
> ! ? wc/dir
> ? wc/dir2
> K 1 wc/afile
> Status against revision: 1
>
> But... oddly enough we can remove the blockage:
> % svn unlock wc/afile
> 'afile' unlocked.
>
> And then through some trickery, restore the path:
> % svn up -N wc/dir
> D wc/dir
> Updated to revision 1.
>
> % svn up -N wc/dir
> A wc/dir
> Updated to revision 1.
>
> All is well:
> % svn st -u wc
> ? wc/dir2
> Status against revision: 1
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org