You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Susan Dittmar <S....@eureca.de> on 2005/12/19 10:46:55 UTC
commit fails, cleanup does not help
Hi,
I'm rather new to svn, so please be patient with me if this question
seems badly formulated or is just a matter of 'RTFM'. I really tried
to find the answers there.
I did a huge bunch of changes in my working copy. Now I'd like to
commit them. I know there were some problems already while I did those
changes, as I first moved huge bunches of files to another directory and
then, without committing (not wishing to make a branch, and not far enough
into development to burden others with my unfinished changes), deleting the
file. I had to use --force for that, but I didn't, at that point, think it
might cause bigger problems.
Now I tried to commit. And svn refuses, answering
Übertrage Daten ........svn: Übertragen fehlgeschlagen (Details folgen):
svn: File already exists: filesystem '/home/svn/repository/Lieder/db',
transaction '128-1',
path '/trunk/INPUT/EINZELSEITEN/Lagerlegenden_Guitar_03.eps'
If I ask svn about transactions, there's no such transaction.
svn cleanup doesn't help either. What can I do?
Thanks in advance for your help,
Susan
PS: In case it is of importance:
I'm using svn, Version 1.1.3 on SuSE Linux 9.3
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: commit fails, cleanup does not help
Posted by Susan Dittmar <S....@eureca.de>.
Quoting Kent Borg (kentborg@borg.org):
> Maybe doing that [svn update] between the delete and add would have
> helped, and it still might help.
I'm not sure whether I did an update between delete and add, but I tried
the update when the commit did not work, and it changed nothing :-(
Susan
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: commit fails, cleanup does not help
Posted by Jon Week <jo...@hotmail.com>.
>
>On Mon, Dec 19, 2005 at 06:11:57PM +0100, Susan Dittmar wrote:
> > I knew I was not yet telling enough :-(
>
>I am a fairly new svn user, but I have discovered that a good ritual
>is to do an "svn update" even when there is nothing you should need
>from the server (because you are the source of the changes!), it seems
>to help clear svn's internal book keeping.
>
>Maybe doing that between the delete and add would have helped, and it
>still might help.
>
>-kb
Oddly enough, the "update" seemed to solve a similar commit problem for me.
I've also been having trouble with commits hanging with apache 2.0.52,
svn1.2.3 and ldap authentication. Just had a commit hang, from which I
killed the window and then did an "update". The following commit worked
perfectly.
-J
_________________________________________________________________
Don�t just search. Find. Check out the new MSN Search!
http://search.msn.click-url.com/go/onm00200636ave/direct/01/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: commit fails, cleanup does not help
Posted by Kent Borg <ke...@borg.org>.
On Mon, Dec 19, 2005 at 06:11:57PM +0100, Susan Dittmar wrote:
> I knew I was not yet telling enough :-(
I am a fairly new svn user, but I have discovered that a good ritual
is to do an "svn update" even when there is nothing you should need
from the server (because you are the source of the changes!), it seems
to help clear svn's internal book keeping.
Maybe doing that between the delete and add would have helped, and it
still might help.
-kb
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: commit fails, cleanup does not help
Posted by kf...@collab.net.
Susan Dittmar <S....@eureca.de> writes:
> I'll try, as much as I remember.
>
> I moved a huge bunch of files into a new directory.
> There I processed some of them, which meant the creation of
> another bunch of files. I told svn to add those new files and to
> remove the now no longer used old files. For this removal I had
> to use the --force switch as the files had not been committed
> since being moved. I even removed some of those just-added files
> again when it turned out I did not need them, and had to use
> --force here too.
>
> I knew I really wanted to delete them, so I did not mind the intermediate
> steps not to be checked in. And then, after some more editing, I tried to
> commit.
>
> > By the way, when you write "ask svn about transactions", how exactly
> > did you do that? I'm not surprised the transaction wasn't there (it
> > probably got removed after the commit failed), I'm just trying to find
> > out everything you did.
>
> As the user owning the repository:
> svnadmin lstxns <repository>
>
> I'm not surprised either, but on the other hand screwed up transactions
> is the only reason for behaviour like this I fould described in the
> documentation. My fault, perhaps.
>
> > I can't guarantee to be able to help. It may be that the only advice
> > we are able to give is to do things over, in smaller stages.
>
> That would be a hell of a job :-(
>
> Thanks for your efforts,
Thanks for the detailed repost, Susan. No, I don't think what
happened is your "fault", but I also can't think of any great advice
to give you, especially without a way to reproduce the problem. I
wrote a script to try to reproduce it, based on your description of
what you did, but it seems to work fine. There must be some step I
haven't included:
#!/bin/sh
SVN=${HOME}/src/subversion/subversion/svn/svn
SVNADMIN=${HOME}/src/subversion/subversion/svnadmin/svnadmin
rm -rf dittmar
mkdir dittmar
cd dittmar
# URL=http://localhost/SOMETHING/repos
# URL=svn://localhost/SOMETHING/repos
URL=file:///`pwd`/repos
rm -rf repos wc
${SVNADMIN} create repos
${SVN} co -q ${URL}/ wc
cd wc
mkdir dirA
mkdir dirB
echo "This is file1.txt." > dirA/file1.txt
echo "This is file2.txt." > dirA/file2.txt
echo "This is file3.txt." > dirA/file3.txt
${SVN} add -q dirA dirB
${SVN} ci -q -m "Add initial content in r1."
${SVN} mv -q dirA/file1.txt dirB/file1.txt
${SVN} mv -q dirA/file2.txt dirB/file2.txt
${SVN} mv -q dirA/file3.txt dirB/file3.txt
# Create the derived ("processed") files from Susan's recipe.
echo "This is file1-new.txt." > dirB/file1-new.txt
echo "This is file2-new.txt." > dirB/file2-new.txt
echo "This is file3-new.txt." > dirB/file3-new.txt
${SVN} add -q dirB/file1-new.txt
${SVN} add -q dirB/file2-new.txt
${SVN} add -q dirB/file3-new.txt
# Remove the old files, which were just moved to this directory.
${SVN} rm --force -q dirB/file1.txt
${SVN} rm --force -q dirB/file2.txt
${SVN} rm --force -q dirB/file3.txt
# Remove some of the newly added files too.
${SVN} rm --force -q dirB/file1-new.txt
${SVN} rm --force -q dirB/file2-new.txt
echo ""
echo "Status just before commit:"
echo ""
${SVN} status
echo ""
echo "Try to commit:"
echo ""
${SVN} ci -m "Commit all those changes."
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: commit fails, cleanup does not help
Posted by Susan Dittmar <S....@eureca.de>.
I knew I was not yet telling enough :-(
> Both server and client are this version? What network layer are you
> using (e.g., http://, or svn://, or file://)?
Both server and client are this version. I'm using svn+ssh://, client and
server on the same computer though different accounts.
> When you say "deleting the file", what do you mean exactly? Would it
> be possible to describe the steps you went through in more detail?
I'll try, as much as I remember.
I moved a huge bunch of files into a new directory.
There I processed some of them, which meant the creation of
another bunch of files. I told svn to add those new files and to
remove the now no longer used old files. For this removal I had
to use the --force switch as the files had not been committed
since being moved. I even removed some of those just-added files
again when it turned out I did not need them, and had to use
--force here too.
I knew I really wanted to delete them, so I did not mind the intermediate
steps not to be checked in. And then, after some more editing, I tried to
commit.
> By the way, when you write "ask svn about transactions", how exactly
> did you do that? I'm not surprised the transaction wasn't there (it
> probably got removed after the commit failed), I'm just trying to find
> out everything you did.
As the user owning the repository:
svnadmin lstxns <repository>
I'm not surprised either, but on the other hand screwed up transactions
is the only reason for behaviour like this I fould described in the
documentation. My fault, perhaps.
> I can't guarantee to be able to help. It may be that the only advice
> we are able to give is to do things over, in smaller stages.
That would be a hell of a job :-(
Thanks for your efforts,
Susan
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: commit fails, cleanup does not help
Posted by kf...@collab.net.
Susan Dittmar <S....@eureca.de> writes:
> I'm rather new to svn, so please be patient with me if this question
> seems badly formulated or is just a matter of 'RTFM'. I really tried
> to find the answers there.
>
> I did a huge bunch of changes in my working copy. Now I'd like to
> commit them. I know there were some problems already while I did those
> changes, as I first moved huge bunches of files to another directory and
> then, without committing (not wishing to make a branch, and not far enough
> into development to burden others with my unfinished changes), deleting the
> file. I had to use --force for that, but I didn't, at that point, think it
> might cause bigger problems.
>
> Now I tried to commit. And svn refuses, answering
>
> Übertrage Daten ........svn: Übertragen fehlgeschlagen (Details folgen):
> svn: File already exists: filesystem '/home/svn/repository/Lieder/db',
> transaction '128-1',
> path '/trunk/INPUT/EINZELSEITEN/Lagerlegenden_Guitar_03.eps'
>
> If I ask svn about transactions, there's no such transaction.
> svn cleanup doesn't help either. What can I do?
>
> Thanks in advance for your help,
>
> Susan
>
> PS: In case it is of importance:
> I'm using svn, Version 1.1.3 on SuSE Linux 9.3
Both server and client are this version? What network layer are you
using (e.g., http://, or svn://, or file://)?
When you say "deleting the file", what do you mean exactly? Would it
be possible to describe the steps you went through in more detail?
By the way, when you write "ask svn about transactions", how exactly
did you do that? I'm not surprised the transaction wasn't there (it
probably got removed after the commit failed), I'm just trying to find
out everything you did.
I can't guarantee to be able to help. It may be that the only advice
we are able to give is to do things over, in smaller stages. But at
least it would be good to find out how svn got into this situation.
Thanks,
-Karl
--
www.collab.net <> CollabNet | Distributed Development On Demand
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org