Re: [orca-list] The very latest Orca crashes after start up

["David E. Price" <deprice cs utah edu>]

Hi, Hermann,

I use cvs much more than svn, but I believe all the letters used when 
upgrading are the same. The most common that you will se are:

? - indicates a file that you have created that is not in the repository

m - File has been modified by you since it was last modified in the 
repository, so will not be upgraded

U - file has been updated

p - file has been patched (reduces downloads of large files)

c - modifications by you conflict with modifications to the file in the 
repository, so will not be updated

g - modifications by you do not conflict with modifications in the 
repository so the changes have been merged.

There are others as well.  These definitions come from memory, so may not be 
completely accurate,  but will give you a sense.

dave

----- Original Message ----- 
From: "Hermann" <meinelisten onlinehome de>
To: "Willie Walker" <William Walker Sun COM>
Cc: "orca-list" <orca-list gnome org>
Sent: Sunday, May 11, 2008 9:41 AM
Subject: Re: [orca-list] The very latest Orca crashes after start up


> Hi,
> Am Sonntag, den 11.05.2008, 11:24 -0400 schrieb Willie Walker:
> > "Whenever you see something like the "<<<<<<< .mine" line:
> >
> >    File "/home/hermann/opt/lib/python2.5/site-packages/orca/default.py",
> > line 4573
> >       <<<<<<< .mine
> >        ^
> >   SyntaxError: invalid syntax
> >
> > It means you had a conflict when updating from trunk.  This usually
> > means that you might have applied a patch from a bug report, but that
> > what ultimately got checked in was a different patch (e.g., the patch
> > was updated later).
> >
> > To resolve this particular problem, you can delete default.py, svn
> > update, and then rebuild/reinstall.  Another thing you can do is look at
> > the output of "svn stat", looking for lines that begin with "C".  This
> > means there was a conflict when updating the file, and the file is bound
> > to have the persnickety "<<<<<<< .mine" lines in it.  In those cases,
> > just delete the offending files and do an "svn update"."
> Thank you very much, that did it. (The second solution(.
> Just for curiosity: What do the other characters mean? (? and M).
> Hermann
>
>
> _______________________________________________
> Orca-list mailing list
> Orca-list gnome org
> http://mail.gnome.org/mailman/listinfo/orca-list
> Visit http://live.gnome.org/Orca for more information on Orca