On 07/14/2015 03:36 PM, Andrea Pescetti wrote: > Kay Schenk wrote: >> In answer to my original question regarding commits to the AOO410 >> branch. It seems my initial suggestion might have been wrong, and >> probably mini-check outs of areas that need to be updated are the way to >> go, with just normal copies -- NOT svn copies -- from trunk to the >> AOO410 branch, followed by a commit. > > This will often miss the meta-information. If you need to merge, just > merge, no need to search for workarounds. I explained it in detail a few > hours ago at > https://bz.apache.org/ooo/show_bug.cgi?id=126281#c11
ok, I missed this. Sorry. I read about merge but I wasn't sure it really applied here. I guess it does though. > > Anyway, whatever one chooses is fine but the merged commit (assuming it > happens within "main") should be displayed at > > https://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ > > in the "svn:mergeinfo" section if one wants to be sure that SVN knows > that the commit coming from trunk was integrated. > > This doesn't cover more complex cases like patches that need to be > adapted for 4.1.2 due to changes in trunk. But it is OK for the bugs > currently under discussion. > >> Additionally, for our further education on svn, I came across this >> article on why TAGS should not be used for future commits -- you must >> use branches. >> http://www.sethcardoza.com/2009/04/svn-copy-creating-a-branch-or-tag/ > > Sure. But we are not doing any new branches or tags at this stage of > development. The "AOO412" tag will come once we are ready for the > release, and it will be used as it is supposed to be used (i.e., mark a > snapshot of the final OpenOffice 4.1.2 sources). Right. I know this. Mostly this was clarification for me and others on the differences between these concepts and what they implied. > > Regards, > Andrea. > -- -------------------------------------------- MzK "Way down deep, we're all motivated by the same urges. Cats have the courage to live by them." -- Jim Davis --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
