[Openmcl-devel] Is it just me, or is the return key all messed up?

[Gary Byers]

You modified your copy of ../easygui/views.lisp, then did an 'svn update'.
SVN couldn't reconcile your changes to this file with changes in the
repository copy, so it announced that there were conflicting changes
(by printing the line with a status marker of "C"); see
<http://trac.clozure.com/openmcl/wiki/UpdatingFromSource>)
and included both your changes and the repository version's in your
working copy (surrounded by ==========, <<<<<<<<< , >>>>>>>>, and
other markers.)  Those "other markers" are intended to help someone
manually merge a few sets of changes; they aren't intended to be
syntactically valid lisp (or valid anything else.)

If you want to have svn discard your changes and use the repository
version, you can do:

$ svn revert /Users/cvandusen/bin/ccl/examples/cocoa/easygui/views.lisp

If you want to keep your local changes, you can edit the file and manually
resolve the conflicting parts, then do:

$ svn resolved /path/to/file

to tell svn that the conflicts have been resolved.

Versions 1.5 and later of svn have other options that can take effect
when a file's been modified locally and also changed on the server.


Seeing complaints about ===== and >>>>> and <<<<< strongly suggest that
a local change is in conflict with something changed in the repository
and that 'svn revert' or 'svn resolved' will be necessary.

On Tue, 14 Jul 2009, Chris Van Dusen wrote:

> 12408 is doing this when building the IDE:
> ;Compiler warnings for
> "/Users/cvandusen/bin/ccl/examples/cocoa/easygui/views.lisp" :
> ;   In VIEW-MOUSE-POSITION: Undeclared free variable =======
> ;   In VIEW-MOUSE-POSITION: Unused lexical variable NSPT
> ;   In VIEW-MOUSE-POSITION: Unused lexical variable .MINE
> ;   In VIEW-MOUSE-POSITION: Unused lexical variable <<<<<<<
> ;   In VIEW-MOUSE-POSITION: Undeclared free variable >>>>>>>
> ;   In VIEW-MOUSE-POSITION: Undeclared free variable .R12408
> ;   In VIEW-MOUSE-POSITION: Undeclared free variable NSPT (2 references)
> Read error between positions 68447 and 68448 in
> /Users/cvandusen/bin/ccl/examples/cocoa/easygui/views.lisp.
> > Error: Reader error on #<BASIC-FILE-CHARACTER-INPUT-STREAM
> ("/Users/cvandusen/bin/ccl/examples/cocoa/easygui/views.lisp"/19 ISO-8859-1)
> #x30004294DA4D>, near position 68448, within "y nspt))))
> >        ":
> >        Unmatched ')' near position 68448.
> > While executing: CCL::SIGNAL-READER-ERROR, in process listener(1).
> > Type cmd-. to abort, cmd-\ for a list of available restarts.
> > Type :? for other options.
> 1 > 
> 
> On Tue, Jul 14, 2009 at 12:35 AM, mikel evins <mevins at mac.com> wrote:
>
>       On Jul 14, 2009, at 12:19 AM, Ron Garret wrote:
>
>       >
>       > On Jul 13, 2009, at 10:04 PM, Ron Garret wrote:
>       >
>       >>
>       >> On Jul 13, 2009, at 9:03 PM, mikel evins wrote:
>       >>
>       >>>
>       >>> On Jul 13, 2009, at 4:08 PM, Ron Garret wrote:
>       >>>
>       >>>> 2. If the cursor is on a line other than the last, then the
>       sexpr
>       >>>> on
>       >>>> that line is copied to the last line AND it is evaluated.
>        This is
>       >>>> badly broken IMHO because there is no opportunity to edit
>       the line.
>       >>>> Now to re-use a previous line of input with changes you
>       have to
>       >>>> select, copy, click, and paste.  Very annoying.  Worse...
>       >>>
>       >>>
>       >>> I think this part is fixed in 12406.
>       >>
>       >> Nope.  Still copying-and-evaluating in one step.
>       >
>       > Whoops, belay that.  Seems to be working now.  Not sure why it
>       > wasn't before.
> 
> Try 12407; I think the spurious newlines on the input line are fixed.
> 
> > I might be able to help out with this if you like since I seem to be
> > the one doing most of the complaining.
> 
> 
> This is kind of fiddly stuff. I think the greatest help you can be is
> to do exactly what you're doing: try it out and see if it does
> anything that bugs you. I have all this code in my head right now, so
> now is a great time to poke at it.
> 
> Let me know how 12407 seems to you.
> 
> --me
> 
> _______________________________________________
> Openmcl-devel mailing list
> Openmcl-devel at clozure.com
> http://clozure.com/mailman/listinfo/openmcl-devel
> 
> 
> 
>