branch modifications
1 view
Skip to first unread message
Robert Schuppenies
Dec 17, 2008, 5:24:54 AM12/17/08
to pympl...@googlegroups.com
How do we handle applied changes to a release branch? I am asking
because I saw a change applied to the 0.1 branch and later manually
repeated in the trunk. I think in general changes to the branch
should be merged back to the trunk to not repeat modifications or
even forget to apply them to the trunk.
because I saw a change applied to the 0.1 branch and later manually
repeated in the trunk. I think in general changes to the branch
should be merged back to the trunk to not repeat modifications or
even forget to apply them to the trunk.
cheers,
robert
Ludwig Hähne
Dec 17, 2008, 5:43:35 AM12/17/08
to pympl...@googlegroups.com
Yes, you are right. I think that was an accident - due to ignorance or
lack of time. Hopefully, Google Code will switch to Subversion 1.5 in
the near future so that merging will be less problematic (I've used
svnmerge in the past to circumvent the problems and hardly used svn
merge manually, though).
Ludwig
Reply all
Reply to author
Forward
0 new messages