Hi, On Thu, Sep 10, 2009 at 10:36, Jukka Zitting<[email protected]> wrote: > When merging fixes back to a maintenance branch I often mark changes > related to improvements and new features with the --record-only > option. This makes the svn mergeinfo command more useful in checking > what fixes could/should still be backported.
hmm, I see. > Normally we shouldn't be backporting non-bugfix changes, so the above > practice shouldn't cause too many problems. In cases where you do need > to merge a non-bugfix change, you can explicitly revert the > --record-only setting to make the merge work. > > Here's an example for the JCR-1988 issue: > > TRUNK=https://svn.apache.org/repos/asf/jackrabbit/trunk > svn merge -c -746932 --record-only $TRUNK > svn merge -c 746932 $TRUNK OK, thanks. I'll do that. regards marcel
