On 7/29/07, David Glasser <glasser@davidglasser.net> wrote:
> On 7/29/07, David James <james@cs.toronto.edu> wrote:
> > 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:
>
> Do you still have the log of how you made the change in the first
> place? Had you 'svn add'ed the file by hand, or was it a result of an
> "svn merge"?
It was the result of a 'svn merge', like so:
[djames@svn2 trunk]$ svn merge -r25740:25739 .
--- Merging r25740:
U build.conf
U build/generator/gen_make.py
U build/generator/swig/__init__.py
A build/generator/swig/checkout_swig_header.py
U build/generator/gen_win.py
U subversion/bindings/swig/include/svn_global.swg
[djames@svn2 trunk]$ svn revert subversion/bindings/swig/include/svn_global.swg
Reverted 'subversion/bindings/swig/include/svn_global.swg'
[djames@svn2 trunk]$ svn st
M build.conf
M build/generator/gen_make.py
M build/generator/swig/__init__.py
A + build/generator/swig/checkout_swig_header.py
M build/generator/gen_win.py
Cheers,
David
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 30 04:39:13 2007