On 22 Apr 2003, Philip Martin wrote:
> 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?
Well, there is a directory called /tmp/mg/trunk, which corresponds to
another project. (If that is what you are asking). The files corresponding
to the /tmp/rc/trunk are not checked out in any other directory. But I am
not clear why you are asking this.
> > 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?
Yes, you can see I am in the directory /tmp/rc/trunk. Or do you mean
something else? There is no subdirectory called trunk within
/tmp/rc/trunk.
> No such directory was visible in your "svn st" output.
> Did you really run "svn commit" without any arguments?
Yes.
> 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?
No. I've included all steps. I never ran "svn up".
> > 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.
I believe I did include a full set of steps. I thought it rather verbose,
if anything. If you want me to try to reproduce the problem, I can. I'm
gradually importing different projects in the repository, so I will
probably have opportunity to do so.
However, I'd like to know what steps I left out that you think I did not
include.
Faheem.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 23 00:41:05 2003