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 \
> > /path/to/working/copy
> > 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:
> > http://svnbook.red-bean.com/en/1.4/svn.advanced.vendorbr.html
> Yeah, I've looked but I was still confused :( I'll let you know how I get on.
Stefan Sperling <email@example.com> Software Developer
elego Software Solutions GmbH HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96
13355 Berlin Fax: +49 30 23 45 86 95
http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
Received on Mon Nov 26 18:01:17 2007
- application/pgp-signature attachment: stored