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

RE: stuck state, loosing data because I can't commit, help....

From: Yount, Steffen <s.yount_at_xpedite.com>
Date: 2004-02-27 20:12:15 CET

Ok, so I can explicitly check in the file, and I do understand that the
directory is under subversion's control, and that I shouldn't be deleting
this directory to begin with...

But, my problems are that 1) a script, which is beyond my control, is
actually doing the deleting of that directory, 2) I don't want to do an "svn
delete" which removes the directory from the repository side, and 3) without
manually doing an "svn status" and sorting through the results, I won't know
which files need to be explicitly committed.

Is it acknowledged that: "svn commit" getting confused under the
circumstances which had I described below is a bug?

The behavior that I'd expect from "svn commit" is that all the files and
directories which have been deleted from the working copy are simply ignored
during a commit, as if they had never been checked out to begin with, or as
if they had never been included under version control.

In other words I think, "svn commit" should treat all the files and the
directories which "svn status" marks with a '!' or a '~' the same way that
"svn commit" treats the files and the directories which "svn status" marks
with a '?'.

Am I missing some use case or other reason why the above suggested behavior
is bad or wrong?

Thanks,
-Steffen

-----Original Message-----
From: Mike Mason [mailto:mgm@thoughtworks.net]
Sent: Friday, February 27, 2004 8:46 AM
To: Yount, Steffen
Cc: 'users@subversion.tigris.org'
Subject: Re: stuck state, loosing data because I can't commit, help....

Yount, Steffen wrote:

> Hi,
>
>
>
> How do I get around this problem?
>
>
>
> 1) I checkout the following directory tree:
>
>
>
> one\
>
> one\subone.txt
>
> one\two\
>
> one\two\subtwo.txt
>
>
>
> 2) I edit: one\subone.txt
>
>
>
> 3) I delete the dir: one\two\
>
You're deleting something that's under Subversion control, and this will
also delete the Subversion admin directories causing Subversion to get
confused. Instead, do "svn delete one\two" to ask Subversion to schedule
that directory for delete. Then your commit should work.

Alternatively if you just want to commit a single file, do "svn commit
one\subone.txt" to get the file checked in.

Best regards,
Mike.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 27 21:26:31 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.