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

Re: Subversion eating up all memory (again)

From: Lukas Ruf <ruf_at_rawip.org>
Date: 2004-11-18 12:34:35 CET

> Simon Large <slarge@blazepoint.co.uk> [2004-11-18 11:52]:
>
> Lukas Ruf wrote:
> > komsys-pc-ruf:kernel!69> svn up
> > svn: Failed to add file 'kprobes.c': object of the same name
> > already exists
> >
> > komsys-pc-ruf:kernel!70> svn commit -m "Re-adding after time-out"
> > kprobes.c Adding kprobes.c
> > svn: Commit failed (details follow):
> > svn: File '/svn/PromethOS/linux/2.6/trunk/kernel/kprobes.c' already
> > exists
>
> Find out what is happening with kprobes.c.
>
> If it already existed in the repo then your local copy has somehow
> become unversioned.
>
> If it is a new file that you have just written and want to add, then it
> looks like someone else has beaten you to it and added it already. SVN
> will not overwrite an unversioned file with a versioned one because it
> might be destroying your data.
>
> Try renaming your local kprobes.c, do the update, then diff the files to
> find out who did what and when.
>
> This sometimes happens to me when I create a new file and send it as a
> patch. Someone else commits it, and then I can't update because I have
> an unversioned local file, and there is now one in the repo (mine!) with
> the same name.
>

I was the only user for sure.

I did first an update of my upstream tree.

Then merged in the changes of the upstream into the trunk.

Started the commit

That stopped with a timeout.

While waiting for the replies, I renamed trunk to _trunk and did a
HEAD checkout of the complete trunk.

komsys-pc-ruf:kernel!80> diff kprobes.c ../../_trunk/kernel/kprobes.c
komsys-pc-ruf:kernel!81>

No changes.

This looks to me as a similar problem I had already a couple of
weeks/months ago: changes get committed in the DB, however, local
status is not updated. It could, as Jani pointed out, be a problem of
my post-commit script:

  #!/bin/sh

  REPOS="$1"
  REV="$2"

  # modified
  commitemail="commit-email.pl"

  perl ${commitemail} "$REPOS" "$REV" \
    -s '[svn] PromethOS:' \
    lukas.ruf@lpr.ch &

Please note the ampersand '&' at the end of the command. I inserted
this based on a recommendation of this list.

If the problem is caused by the post-commit hook, I run into troubles
since these emails are required by the users.... I could imagine that
one way to avoid the problem would be that commit-email.pl would check
the size of the commit before starting the real procedure.

wbr,
Lukas

-- 
Lukas Ruf           | Wanna know anything about raw |
<http://www.lpr.ch> | IP? -> <http://www.rawip.org> |
eMail Style Guide: <http://www.rawip.org/style.html>|
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 18 12:35:33 2004

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