Bugs item #2007115, was opened at 2008-06-30 23:03
Message generated for change (Comment added) made by h92-nowiki
You can respond by visiting:
https://sourceforge.net/tracker/?func=detail&atid=603138&aid=200711…
Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: other
Group: None
Status: Closed
Resolution: Invalid
Priority: 5
Private: No
Submitted By: H92-nowiki (h92-nowiki)
Assigned to: Nobody/Anonymous (nobody)
Summary: SyntaxError: invalid syntax
Initial Comment:
python version.py output:
Pywikipedia [http] trunk/pywikipedia (r5660, Jun 30 2008, 13:04:44)
Python 2.5.1 (r251:54869, Apr 18 2007, 22:08:04)
[GCC 4.0.1 (Apple Computer, Inc. build 5367)]
OK: Recently, clean_sandbox.py, replace.py, template.py and more have failed, producing
the same message:
File "/[blablabla]/clean_sandbox.py", line 55
<<<<<<< .mine
^
SyntaxError: invalid syntax
The other scripts I mentioned also produce this (but with another line number), replace.py
produces line 156 for instance.
What is this, how can it be fixed?
Oh, and I apologize for any mistakes in this report, it's my first time. :)
Best regards,
w:no:User:H92
----------------------------------------------------------------------
Comment By: H92-nowiki (h92-nowiki)
Date:
2008-07-01 13:10
Message:
Logged In: YES
user_id=2131834
Originator: YES
Uhh, ok thanks! It works now. :)
----------------------------------------------------------------------
Comment By: NicDumZ — Nicolas Dumazet (nicdumz)
Date: 2008-07-01 11:59
Message:
Logged In: YES
user_id=1963242
Originator: NO
Read
http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.4 for
more about subversion conflicts :)
----------------------------------------------------------------------
Comment By: Rotem Liss (rotemliss)
Date: 2008-07-01 11:48
Message:
Logged In: YES
user_id=1327030
Originator: NO
This is a Subversion conflict: you have changed files that were changed in
the Subversion server, and thus "svn update" caused a conflict (since it
couldn't merge the changes). You may check which files are in conflict
using "svn status". You should clean it up manually and run "svn
resolved"
on the files, or use "svn revert" to revert to the original SVN version.
----------------------------------------------------------------------
You can respond by visiting:
https://sourceforge.net/tracker/?func=detail&atid=603138&aid=200711…