On Mon, Jan 25, 2010 at 7:16 PM, Senthil Kumaran S <sent...@collab.net> wrote: > Hi Paul, > > Paul Burba wrote: >> >> On Fri, Dec 18, 2009 at 4:16 AM, <style...@apache.org> wrote: >>> >>> Author: stylesen >>> Date: Fri Dec 18 09:16:18 2009 >>> New Revision: 892189 >>> >>> URL: http://svn.apache.org/viewvc?rev=892189&view=rev >>> Log: >>> Merge r891672 from ^/subversion/trunk. >>> >>> Modify subversion/tests/cmdline/externals_tests.py to correct some >>> latest changes on this test in trunk (r876917). >>> >>> Modified: >>> >>> subversion/branches/1.6.x-r891672/subversion/libsvn_client/commit_util.c >>> >>> subversion/branches/1.6.x-r891672/subversion/tests/cmdline/externals_tests.py >> >> What client version of svn did you perform this merge with? I'm >> curious as to why that no mergeinfo was recorded. Did you >> --ignore-ancestry? Or revert the svn:mergeinfo property changes? Or >> just not commit them? Or something else?Paul > > I used latest development version of subversion to perform this merge. It > should be the latest trunk revision of subversion source as on Dec 18, 2010. > No, I did not do an --ignore-ancestry or edited the svn:mergeinfo property.
Hmmm. I just built tr...@892188 (the latest version of trunk on 12/18/2009 prior to this commit). I redid this merge and mergeinfo was set as expected: C:\SVN\src-branch-1.6.x-r891672>svn --version -q 1.7.0-dev C:\SVN\src-branch-1.6.x-r891672>svn info Path: . URL: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r891672 Repository Root: https://svn.apache.org/repos/asf Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68 Revision: 892188 Node Kind: directory Schedule: normal Last Changed Author: stylesen Last Changed Rev: 891677 Last Changed Date: 2009-12-17 07:47:52 -0500 (Thu, 17 Dec 2009) C:\SVN\src-branch-1.6.x-r891672>svn merge ^^/subversion/trunk -c891672 --- Merging r891672 into '.': U subversion\libsvn_client\commit_util.c U subversion\tests\cmdline\externals_tests.py C:\SVN\src-branch-1.6.x-r891672>svn st M . M subversion\tests\cmdline\externals_tests.py M subversion\libsvn_client\commit_util.c C:\SVN\src-branch-1.6.x-r891672>svn diff --depth empty Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /subversion/trunk:r891672 Did you commit from some directory below the root of the branch or use some GUI that allowed you to deselect the mergeinfo change? I'm just trying to figure out if you've come across some diabolical bug or if this is just pilot error. Paul P.S. I redid this merge using --record-only and committed the change in r903466. I did this for two reasons: 1) So the correct mergeinfo is set. 2) To see what impact it has on the problem Julian reported here: http://svn.haxx.se/dev/archive-2010-01/0606.shtml and I speculated might be related to the lack of mergeinfo from this merge.
