thanks, I'll be more careful with the up arrow and return keys.

On Wed, Sep 22, 2010 at 9:54 AM, P T Withington <[email protected]> wrote:

> On 2010-09-22, at 09:30, Lou Iorio wrote:
>
> > I checked in some files that I shouldn't have (langref.xml was the
> > only file I meant to check in):
> >
> > ~/src/svn/openlaszlo/trunk $ svn-commit
> > Sending        demos/lzproject/derby/lzprojectdb/log/log.ctrl
> > Sending        demos/lzproject/derby/lzprojectdb/log/log1.dat
> > Sending        demos/lzproject/derby/lzprojectdb/log/logmirror.ctrl
> > Sending        docs/src/reference/langref.xml
> > Transmitting file data ....
> > Committed revision 17546.
> > Log message from 'svn log -v -r17546' follows:
> > ------------------------------------------------------------------------
> > r17546 | lou | 2010-09-22 09:26:25 -0400 (Wed, 22 Sep 2010) | 27 lines
> > Changed paths:
> >   M /openlaszlo/trunk/demos/lzproject/derby/lzprojectdb/log/log.ctrl
> >   M /openlaszlo/trunk/demos/lzproject/derby/lzprojectdb/log/log1.dat
> >   M
> /openlaszlo/trunk/demos/lzproject/derby/lzprojectdb/log/logmirror.ctrl
> >   M /openlaszlo/trunk/docs/src/reference/langref.xml
> >
> > Change 20100922-lou-B by [email protected] on 2010-09-22 09:26:13 AST
> >    in /Users/lou/src/svn/openlaszlo/trunk
> >    for http://svn.openlaszlo.org/openlaszlo/trunk
> >
> > Is there a way to undo this, or will these just get overwritten with the
> > next
> > build?
>
> The way to reverse a change is to to a backwards integration, which I did
> for you:
>
> [...@padme trunk-3 09:51:33]$ svn merge -r17546:17545 .
> --- Reverse-merging r17546 into '.':
> U    docs/src/reference/langref.xml
> U    demos/lzproject/derby/lzprojectdb/log/logmirror.ctrl
> U    demos/lzproject/derby/lzprojectdb/log/log.ctrl
> U    demos/lzproject/derby/lzprojectdb/log/log1.dat
> [...@padme trunk-3 09:51:55]$ svn revert docs/src/reference/langref.xml
> Reverted 'docs/src/reference/langref.xml'
> [...@padme trunk-3 09:52:14]$ svn diff
> Index: demos/lzproject/derby/lzprojectdb/log/logmirror.ctrl
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: demos/lzproject/derby/lzprojectdb/log/log.ctrl
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: demos/lzproject/derby/lzprojectdb/log/log1.dat
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> [...@padme trunk-3 09:52:16]$ svn commit -m "Undoing extraneous changes in
> r17546"
> Sending        demos/lzproject/derby/lzprojectdb/log/log.ctrl
> Sending        demos/lzproject/derby/lzprojectdb/log/log1.dat
> Sending        demos/lzproject/derby/lzprojectdb/log/logmirror.ctrl
> Transmitting file data ...
> Committed revision 17547.
> [...@padme trunk-3 09:53:23]$
>
>
>
>
>
>

Reply via email to