Stefano Zacchiroli wrote:
On Tue, May 08, 2007 at 04:50:36PM -0500, Robert Lee wrote:
The SVN Repos has conflict markers left in the file filetype.vim,
Sorry for the silly question, but the answer is not clear to me from
your text: is your working copy that has conflict markers or the last
committed version in the repository which has been committed without
removing conflict markers?
I assumed the repository as I make no local changes to my checkout and
didn't get any errors back from svn update. I ran the update yesterday
and got r263. Everything compiled smooth, but I got errors on startup. I
did an "svn update -r 260" without thinking much of it (I thought maybe
I compiled wrong -- and maybe I did). Revision 260 is what I was running
before I did the update yesterday and is running again now without a hitch.
To be honest, I never investigated the issue enough to know the exact
problem, but whatever it was, it was either caused by me and is
unrelated to Scott's issue, or is in the repository somewhere between
r260 and r263. Based on the specific information provided by Scott, I
assumed that there are markers left in the file in the repository. To
check for myself, I just did a fresh checkout into a new folder of r263
and I see no markers there, so maybe I did compile wrong after all. The
diff of 262:263 is gigantic at over 2mb (Bram, you've been busy!), so I
don't know if I want to pour over it too much more than I have already.
Scott: Do you still have the version of filetype.vim with the markers in
it? I overwrote the r263 checkout I had trouble with :(. By the way, to
get out of 7.1a.001 and back to 7.0.243 (which I assume is what you
wanted to begin with), just use: "svn update -r 261" and recompile.
-Robert
