Re: X Strike Force XFree86 SVN commit: r1674 - in branches/4.3.0/sid/debian: . patches
On Tue, Jul 27, 2004 at 01:41:44AM -0500, Branden Robinson wrote:
> On Mon, Jul 19, 2004 at 09:45:50AM -0500, X Strike Force SVN Repository Admin wrote:
> > Modified:
> > branches/4.3.0/sid/debian/changelog
> > branches/4.3.0/sid/debian/patches/031_glxinfo_makefile.diff
>
> Yikes!
>
> Please don't commit to the release branch!
Oops.. sorry.
> Please revert this commit. "svn merge -r 1674:1673" should do the trick.
Do you mean "svn merge -r 1674:1673 <path>"? I tried this and all it did was
reverting the change in my local tree:
$ svn st
M debian/patches/031_glxinfo_makefile.diff
M debian/changelog
Doing a "svn commit" now would revert the change, but I'm not sure if that's
the way it should be done. Do you want me to do that?
OTOH, I also tried "svn merge -r 1674:1673 svn+ssh://....", which apparently
had no effect.
--
Robert Millan
(Debra and Ian) (Gnu's Not (UNiplexed Information and Computing System))/\
(kernel of *(Berkeley Software Distribution))
Reply to: