On Sun, Oct 03, 2010 at 07:02:01PM +0530, Ramkumar Ramachandra wrote: > Hi Julian, > > Julian Foad writes: > > Looks good to me. > > > > I wondered if it is safe in a long-running Subversion process, like > > TortoiseSvn or a Linux equivalent. > > > > It seems to me that it won't really matter much in practice. If someone > > changes their umask and finds that Subversion carries on creating files > > with the 'old' permissions that were in effect when Subversion was > > started... that's fine, as far as I'm concerned. > > 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 > 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. > 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). Thanks, Stefan
