I believe svn merge defaults to updating the merginfo for *all* files/dirs below the current merge dir that have previously been merged (and thus have mergeinfo already), just so that it is up to date.
I tend to merge the narrowest dir I can and 'svn revert' the mergeinfo changes on any files/dirs that werent actually modified/dont contain files updated by the merge, leaving only the content changes and the mergeinfo change on the files themselves and their containing directories. This is jsut so the diff looks less cluttered, I dont think there is harm in including the extra mergeinfo updates or leaving them out. For svn merge to know that you heve merged a change on a file/dir the file/dir need mergeinfo added to tell it in future that it doesnt need to merge that change again (eg if you specify a range of commits), but the mergeinfo updates for non-changed files/folders only serves to illustrate the merge happened and perhaps aid future svn merge performance. So long as the actual changed files and their containing folder have mergeinfo applied that should be all thats required for a 'proper merge' record to be kept. Robbie On 18 November 2010 14:19, Ken Giusti <kgiu...@redhat.com> wrote: > Hi, > > Done! http://svn.apache.org/viewvc?view=revision&revision=1036461 > > Also: https://issues.apache.org/jira/browse/QPID-2951 > > One question: after I merged the changes from trunk to my 0.8 branch, I > noticed that not only did my changes come over but a number of unrelated > files appeared to have their "svn:mergeinfo" properties changed. Is this > expected? The svn docs I found didn't describe this, and a quick google > search showed many suggestions to both check them in, and revert them... > > I just committed the two files that contain my merge changes, leaving the > svn:merginfo changes uncommitted unless I hear otherwise. > > thanks, > > > -K > > ----- "Robbie Gemmell" <robbie.gemm...@gmail.com> wrote: > >> Hi Ken, >> >> Yes, please merge the readme changes across to the branch. Deferring >> the qmf-agent update seems sensible. >> >> Thanks, >> Robbie >> >> On 17 November 2010 18:57, Ken Giusti <kgiu...@redhat.com> wrote: >> > Hi, >> > >> > Per Alan's findings, I've added a (admittedly terse) README.txt to >> the examples/qmf-console directory on trunk: >> > >> > http://svn.apache.org/viewvc?rev=1036157&view=rev >> > http://svn.apache.org/viewvc?rev=1036158&view=rev >> > >> > Shall I pull these over to the 0.8 branch? >> > >> > Also, Alan pointed out that the qmf-agent is not included in the >> release. I've looked into it a bit - there's no automake/cmake/vcproj >> support for that example. The Makefile is hard-coded, and there is a >> dependency on the qmf-gen tool in order to build the example schemas. >> > >> > I don't think the omission of the qmf-agent example is a blocker - >> I'd rather open a JIRA to include it in the next release. >> > >> > >> > -K >> > >> > ----- "Alan Conway" <acon...@redhat.com> wrote: >> > >> >> On 11/14/2010 05:22 PM, Robbie Gemmell wrote: >> >> > Hi all, >> >> > >> >> > Qpid 0.8 RC2 can nowbe found for download at: >> >> > http://people.apache.org/~robbie/qpid/0.8/RC2/ >> >> > >> >> >> >> I tested the C++ package qpid-cpp-0.8.tar.gz on fedora and rhel5 >> with >> >> cluster >> >> pre-requisites installed. >> >> >> >> There's an out of date RELEASE_NOTES file from the M4 release. Do >> we >> >> overwrite >> >> that each time or do we have a better way of getting release notes >> >> (e.g. from >> >> JIRAs)? It is referred to by README.txt so if we remove it we need >> to >> >> update that. >> >> >> >> No problem with ./configure; make check; make install >> >> Started a cluster, did some basic tests, everything looks ok. >> >> >> >> examples/README.txt had inconsistent line endings, I checked in a >> fix >> >> on 0.8 >> >> branch & trunk >> >> >> >> examples/qmf_agent is missing. Its there in the source tree but is >> >> missing the >> >> makefile magic to put it in the package. >> >> >> >> examples/qmf_console has no documentation in README.txt >> >> >> >> >> >> >> --------------------------------------------------------------------- >> >> Apache Qpid - AMQP Messaging Implementation >> >> Project: http://qpid.apache.org >> >> Use/Interact: mailto:dev-subscr...@qpid.apache.org >> > >> > >> --------------------------------------------------------------------- >> > Apache Qpid - AMQP Messaging Implementation >> > Project: http://qpid.apache.org >> > Use/Interact: mailto:dev-subscr...@qpid.apache.org >> > >> > >> >> --------------------------------------------------------------------- >> Apache Qpid - AMQP Messaging Implementation >> Project: http://qpid.apache.org >> Use/Interact: mailto:dev-subscr...@qpid.apache.org > > --------------------------------------------------------------------- > Apache Qpid - AMQP Messaging Implementation > Project: http://qpid.apache.org > Use/Interact: mailto:dev-subscr...@qpid.apache.org > > --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:dev-subscr...@qpid.apache.org
