Mark Wagner wrote:
>>> I've got a Subversion repository containing a set of changes I'm
>>> interested in (specifically, revision 189) and a version of the source
>>> code that isn't managed by Subversion. How would I go about
>>> converting r189 into a patch to apply to the non-managed code, or is
>> svn diff -c 189 $pathToUrl
>> then use that to patch. at least i think that should do it..
>>> there a better way to do this?
>> version everything.
> Got a time machine?
I think you can get one from Apple ;-) *scnr*
No seriously: It's never too late to put source code under version
control, is it?
What are you doing with the unmanaged copy and why do you need to apply
patches to it? Will you need any more patches in the future?
You could still create a branch - let's say it branches off at revision
99 (take one that makes some sense - this might be revision 1 if the
unmanaged code is older than your managed code) - and commit the
(formerly) unmanaged version there. Voilà, now it's managed :-)
The advantage? You can now merge revision 189 from trunk (or is that in
a branch as well?) to your new branch - you'll get some help with
conflict resolution, if you're using Subversion 1.5 or better, you get
merge tracking (just in case you need to merge more than this one
revision in the future) and of course, you'll get a history of
everything you're doing from now on... Unless revision 189 is trivial,
it might be nice to see *exactly* what happened later on...
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-09 01:10:10 CET