Julian Foad <julianfoad@btopenworld.com> writes:
> No, that's not what I meant at all. Sorry, I didn't realise that it
> would read like that. I quoted those numbers just to describe a
> reproducible scenario in which I encountered the conflicts I described
> next. In my scenario, the space-change was the local change and those
> 17 changes came from the repository; I assumed the result would be
> similar when 17 files are locally changed and the space-change comes
> from the repository.
Ah, I understand now. Yeah, the situation is symmetrical.
> # OK, so I can either resolve the conflicts where marked within the
> file (and in fact there aren't as many, or the chunks aren't as big,
> as I feared they would be) or I can build the file back from the saved
> versions of it (.mine, .r18463, .r18475).
Or you can save your changes as a patch, then edit the patch to use
no-space-before-paren style (in context as well as in your changes),
and try re-applying it after updating.
> # Now I've resolved all of those 10 files, in about 40 minutes, by
> editing them and looking for the conflict markers.
Ah, okay. Sorry for the 40 minutes.
> I'd still advise everyone to at least save a diff of your local
> changes before updating today, so that you can recover easily if it
> leaves a big mess (basically if your local changes are extensive).
+1
> > Adjusting outstanding patches to meet the new codebase
> > should be pretty trivial, though.
>
> Yes.
>
> Well, good on you for getting this over and done with.
>
> :-)
I knew there was a reason I went into version control instead of
investment banking.
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 16 08:33:35 2006