Answering to myself, --- Lun 25/6/12, Pedro Giffuni <p...@apache.org> ha scritto: ... > > --- Lun 25/6/12, Jürgen Schmidt <jogischm...@googlemail.com> > ha scritto: > ... > >
> > We should use svn merge to integrate a fix from one > code > > base into another one. > > > > I am not a svn:mergeinfo expert but I recommend doing > svn merge in one direction only. > > In trunk we want to keep record of the merges from > the development branches (Armin has already done it) > and in the stable branch (AOO34) we want to track > only things from trunk. > > If we start merging from everywhere we will get a > rather messy "spaghetti" structure but, worse than > that, the mergeinfo in trunk will be unnecessarily > big and will be inherited into all the branches. > Actually ... This is not a big issue. Tracking merges from different branches is much better than not tracking at all. Pedro. > Just my $0.002, > > Pedro. > > >
