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

Re: svn commit: r25877 - in trunk: . build/generator build/generator/swig

From: David James <james_at_cs.toronto.edu>
Date: 2007-07-29 19:45:50 CEST

On 7/28/07, Daniel Rall <dlr@collab.net> wrote:
> > * build/generator/swig/checkout_swig_header.py:
> > (): Restore deleted file.
> > (checkout): Remove "long long" hacks which were obsoleted by r25740.
> David, this commit breaks invocation of gen-make.py:
> [...]
> I haven't looked into the details, but reverting this commit removes this
> error.

It looks like my Subversion client somehow left out
"build/generator/swig/checkout_swig_header.py" when I committed
r25877. This looks like a bug in Subversion trunk. (I'm using
Subversion trunk from July 14.)

When I first committed my changes, Subversion said the following:

[djames@svn2 trunk]$ svn commit
Sending build/generator/gen_make.py
Sending build/generator/gen_win.py
Sending build/generator/swig/__init__.py
Adding build/generator/swig/checkout_swig_header.py
Sending build.conf
svn: Commit failed (details follow):
svn: Your file or directory 'build.conf' is probably out-of-date
svn: The version resource does not correspond to the resource within
the transaction. Either the requested version resource is out of date
(needs to be updated), or the requested version resource is newer than
the transaction root (restart the commit).
svn: Your commit message was left in a temporary file:
svn: '/home/djames/trunk/svn-commit.tmp'

After seeing this message, I typed 'svn up', and committed my changes again:

[djames@svn2 trunk]$ svn commit -F svn-commit.tmp
Sending build/generator/gen_make.py
Sending build/generator/gen_win.py
Sending build/generator/swig/__init__.py
Sending build.conf
Transmitting file data ....
Committed revision 25877.

Notice that Subversion forgot to add checkout_swig_header.py? Looking
over the complete log of my session, I see that Subversion actually
marked checkout_swig_header.py as deleted in my working copy when I
typed 'svn up':

[djames@svn2 trunk]$ svn up
G build.conf
D build/generator/swig/checkout_swig_header.py

Yikes! It looks like my update got deleted when I typed 'svn up'.
Fortunately, 'checkout_swig_header.py' was still present in my working
copy, but, unfortunately, it wasn't marked as 'added' anymore.

I've attached a longer log of my session (which includes the output of
svn --version, and the full log of the update) as



P.S. (It looks like Justin re-added checkout_swig_header.py in r25880.
I committed the rest of my changes to the file in r25883.)

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Sun Jul 29 19:44:31 2007

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

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