Re: [ jEdit-devel ] merge requests procedure

[Jarek C. <jar...@po...>]

Thanks a lot Kazutoshi. I corrected svn commands. The file 
release-procedure.txt was already linked from wiki, but at "Submitting a 
merge request", the previous section, so I pulled all I could from it.

I don't know if ^ may be really a part of the svn command. I don't see 
it in svn manual. I replaced it with the full path. If ^ is a correct 
element of the syntax, please let me know.

Another thing is that merge requests stay untouched for a long time. 
It's not good because the users are unable to use daily stable release. 
I understand that devs have no time and motivation for taking them on. 
So I suggest following changes to the procedure:
1. A submitter of a merge request may boost the priority of the entry to 
6, if it has not been merged (or commented) for a month.
2. If 2 weeks have passed since the submitter boosted the priority, he 
is entitled to do the merge himself.

This reduces the safety measures that were designed by you, Kazuthoshi. 
But safety costs. If we can't afford it, we should lower the safety 
requirements. Still people caring about the safety will have 1 1/2 of a 
month to deal with MRs.

Jarek

W dniu 2012-05-11 01:22, Kazutoshi Satoda pisze:
> 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 .
>