-----BEGIN PGP SIGNED MESSAGE-----
Stefan Sperling wrote:
> On Mon, Nov 26, 2007 at 04:15:56PM +0000, Nathan Watson-Haigh wrote:
>>> svn merge file:///repo/tags/project-1.2.12 \
>>> file:///repo/tags/project-1.2.16 \
>>> Again if you've moved lots of files you may need to manually sort
>>> things out somehow. Once you've sorted out what should be were
>>> and got rid of all conflicts, you can commit and your trunk will
>>> have the 1.2.16 code built in.
>> I think it's this step where it got complicated last time. It
>> complained about not being able to find the files in the "upload" dir.
>> This was because in trunk, it's contents were moved to it's parent
>> dir. Any thoughts on making this less laborious in future?
> Permanently moving the files in trunk back to where they are upstream?
> Or you could always move them to where they are upstream,
> commit, do the merge, commit, move the files back where you want
> them to be, and commit again. This is not pretty, but should work :)
>>>> Maybe my understanding of the vendor branch is limited/warped
>>> Yes, you should probably also refer to the book:
>> Yeah, I've looked but I was still confused :( I'll let you know how I get on.
> Good luck!
Thanks for your help stefan!
I proceeded as follows:
Before loading a release into the vendor branch with svn_load_dirs.pl, I
moved the contents of the upload dir into the parent directory and
deleted the upload dir. This means that the vendor branch has the same
layout as we have in the trunk, making merging changes between vendor
releases into the trunk much simpler. Just need to remember to do that
for all future vendor releases now!
Thanks once again, I'm now feeling more comfortable with vendor
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Wed Nov 28 09:52:36 2007