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 ;)
While on the subject of node types, I'd be interested to hear what
you think/know about updating or changing them. That'd seem more
interesting to me (I'm not sure I see the interest of namespaces
other than avoiding clashes which could be avoided with prefixes
too?) Say for the forum, I'm defining very precise node types, and
it's very likely that these will evolve over time. Since its' just
starting now, its ok <for me> to just drop my repo and start from
scratch again. Any idea what can happen if one needs to change
existing node types ?
Cheers
g
----------------------------------------------------------------
for list details see
http://www.magnolia.info/en/developer.html
----------------------------------------------------------------
