Am Donnerstag, 3. Mai 2007 schrieb Grégory Joseph: > On May 3, 2007, at 14:44 , Oliver Lietz wrote: > > Am Donnerstag, 3. Mai 2007 schrieb Grégory Joseph: > > [...] > > > >>> I fear that branching > >> > >> svn cp http://.../trunk http://.../branch/my-sexy-branch > >> > >>> and merging > >> > >> <checkout trunk again> > >> svn merge -r 1234:1267 http://.../branch/my-sexy-branch > > > > [...] > > > >> That's what merging the potential branch would do, but instead of > >> having a patch file lying around and taking care not to commit those > >> changes, there would be buildable code. > > > > That's all? I read the chapter of branching and merging in the SVN > > book and > > that sounded quite different. What about backporting changes from > > trunk to my > > sexy branch? Is it really that easy with svn merge? > > if you're in your branch: > svn merge -r 357:479 http://.../trunk > will backport the changes made in revisions 357 to 479 to the branch > > (after that you still need to check the changes and commit - > preferably with a meaningful message that specifies the -r x:y) > > Read pages 55:65 if you have the same book I have (oreilly's 1st > edition) and you'll see it just comes down to this ;)
Hi Greg, can you please suggest a name for the branch? It will contain the custom node type, namespace and multi value property stuff. cheers, O. ---------------------------------------------------------------- for list details see http://www.magnolia.info/en/developer.html ----------------------------------------------------------------
