From: Kazutoshi S. <k_s...@f2...> - 2012-05-10 23:22:22
|
Jarek Czekalski wrote: > 1. What unusual is needed except committing a merge request to 4.5.x > branch? Any svn properties must be set? > > 2. Kazutoshi, Vampire: When you do a core release you put merged > revisions in an svn property. I can't find info about it in > releasing-jedit.txt. Am I missing something or the instruction should be > updated? > Maybe this is ok regarding question 1.? > https://sourceforge.net/apps/mediawiki/jedit/index.php?title=Conventions,_procedures#Committing_a_merge_request Here are some quick answers: Please look through doc/release-procedure.txt first. The original intent and some rules are written in the file. About svn:mergeinfo, it is set by "svn merge ..." command, and you shouldn't edit it manually in general. In WC for a stable branch, the following command (or whatever merge command of your svn client) will apply the change and set svn:mergeinfo at the same time appropriately. $ svn merge -rX:Y ^/jEdit/trunk . -- k_satoda |