Hi Stefan, Stefan Sperling writes: > > Can I get an explicit +1 to commit this? I just want to get as many of > > Stefan's changes merged in quickly so that there's enough time before > > the 1.7 release to test them. > > > > Technical detail: How do I merge? > > cd svn-trunk-working-copy > svn merge -c r985477 ^/subversion/branches/performance > # edit if necessary > svn commit > > # Take note of committed revision, e.g. rN. > # I'd recommend doing the following to avoid a cyclic (aka "reflective") > merge. > # The commit just made should not bounce back to the performance branch > # when someone runs svn merge ^/subversion/trunk on that branch > > cd svn-performance-branch-working-copy > svn merge --record-only -rN ^/subversion/trunk > svn commit -m "Block rN from being merged into the performance branch to > avoid a cyclic merge" > > If you don't understand why the record-only merge is necessary, see > http://mail-archives.apache.org/mod_mbox/subversion-dev/201004.mbox/%3c20100406152724.gm19...@noel.stsp.name%3e
Thanks for the elaborate explanation! :) > > I want to make some modifications to > > this patch before committing > > What kinds of modifications do you want to make? > You'll need a +1 for those, too. Please mail the diff which shows the > results of the merge plus your modifications. Just minor indentation/ comment changes (some mentioned in my review). Nothing functional. > > but I want to preserve authorship. > > r985477 lists stefan2 as author. There is no concept of authorship in svn > beyond that. You'll be listed as author of the merge commit, and your log > message should say which change you're merging (the mergeinfo will also > say it, but it doesn't hurt to mention it in the commit message anyway). Ok, so when the build on trunk breaks, I'll be blamed, not stefan2- I think I can live with that. I'll also need to merge 5~10 more commits: will do shortly. My objective is to get whatever I think I can evaluate into trunk as quickly as possible so that they're well-tested and shipped with Subversion 1.7. I'm inexperienced, and will only attempt to evaluate a subset of patches that directly affect svnrdump: I would request someone else to pick up the other patches. -- Ram
