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

Re: questions about properties and svn:ignore

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-04-22 19:44:16 CEST

Faheem Mitha <faheem@email.unc.edu> writes:

> faheem /tmp/rc/trunk>svn status -u
> M * 5 5 faheem .
> M 5 5 faheem .RData
> M 5 5 faheem .Rhistory
> M 5 5 faheem Makefile
> M 5 5 faheem rc.R
> M 5 5 faheem rc.cc
> M 5 5 faheem rc.hh
>
> Now I can't do a commit (see below). I'm also puzzled about *. This
> apparently means out of date, which means the repository has the
> change but not the working copy. But I thought that the svn:ignore was
> only changed in the working copy.

It looks revision 6 affected the "." directory in the repository, and
you working copy is at revision 5. Do you have more than one working
copy for this repository?

> Incidentally, the svn status listing is not the behaviour the
> Subversion book describes. According to it, the files .RData and
> .Rhistory should now be missing from the display.
>
> faheem /tmp/rc/trunk>svn commit
> Sending trunk
> svn: Transaction is out of date
> svn: Commit failed (details follow):
> svn: out of date: `/rc/trunk' in txn `h'
> svn: Your commit message was left in a temporary file:
> svn: '/tmp/rc/svn-commit.tmp'
>
> So I removed the svn:ignore and could then commit.
>
> faheem /tmp/rc/trunk>svn propdel svn:ignore .
> property `svn:ignore' deleted from ''.
> faheem /tmp/rc/trunk>svn propget svn:ignore .
> faheem /tmp/rc/trunk>svn commit
> Sending trunk
> Sending trunk/.RData
> Sending trunk/.Rhistory
> Sending trunk/Makefile
> Sending trunk/rc.R
> Sending trunk/rc.cc
> Sending trunk/rc.hh
> Transmitting file data ......
> Committed revision 7.

Two things strike me as odd. First is the "trunk" in the feedback
lines. If I have a working copy and I modify the "." directory, and
some files in ".", then when I commit I get things like

Sending .
Sending rc.R

I don't get a "trunk" component in the "Sending" lines. Do you have a
"trunk" directory in your working copy? No such directory was visible
in your "svn st" output. Did you really run "svn commit" without any
arguments?

The second thing is this commit has "Sending trunk" just like the
commit that failed. Did you leave out some steps? Did you perhaps
run "svn up" at some stage?

> I then added the svn:ignore setting back again and committed again.
>
> faheem /tmp/rc/trunk>svn propedit svn:ignore .
> Set new value for property `svn:ignore' on `'
> faheem /tmp/rc/trunk>svn commit
> Sending trunk
>
> Committed revision 8.

Given that the previous commit succeeded it's not surprising that this
one succeeded--both commits modify "trunk" so your working copy would
have been up to date after the revision 7 commit.

If you need more help I think you are going to have to provide a full
set of steps to enable someone else to reproduce the problem.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Apr 22 19:45:04 2003

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