I agree that this test would be difficult. Then it is better to have a script that: 1) create a local branch "merged_pr"; 2) merges to the branch pull request with the largest number; 3) if there is a merge conflict then rolls back the changes and move to pull request with a next number; 4) build sources; 5) If the assembly fails then rolls back the changes and move to pull request with next number; 6) if source builded successfuly then repeats steps 2-5 for pull request with next number; 7) If a request does not remain then displays a summary report. Resulted code can be tested to prevent introdused bugs like FS-8014 <https://freeswitch.org/jira/browse/FS-8014> On Fri, Oct 2, 2015 at 11:58 AM, Stanislav Sinyagin <ssinyagin@gmail.com> wrote:
no, it's definitely a bad idea to merge all pull requests automatically. Many of them are in reviewing and criticizing process, and some of them weren't yet reviewed. Some are known to break things, and aren't yet declined.
On Fri, Oct 2, 2015 at 9:49 AM, Sergey Safarov <s.safarov@gmail.com> wrote:
Hello Brian I learned to use a little git, and now I can help test requests. I found that before the command "git pr <PR_NUMBER>" must be given "git fetch origin".
I would also like suggest to create a branch named "merged_pr" and a script that will merge all open pull requests. So the community will have the opportunity to test the assembly with all current pull requests. If bugs are found, then find them via the "git bisect".
If you think it is useful, whether to suggest the implementation of the script?
Sergey
On Thu, Jul 9, 2015 at 12:04 AM, Brian West <brian@freeswitch.org> wrote:
Checkout freeswitch master first!
git clone https://freeswitch.org/stash/scm/fs/freeswitch.git freeswitch.git
cd freeswitch.git
git config --add remote.origin.fetch '+refs/pull-requests/*/from:refs/remotes/origin/pr/*' git config alias.pr '!f() { git checkout pr/$1; git config branch.pr/$1.merge refs/pull-requests/$1/from;} ; f'
git pr <PR_NUMBER>
build, test, report back.
You can view the list of pull requests here:
https://freeswitch.org/stash/projects/FS/repos/freeswitch/pull-requests
Questions? Comments?
Thanks,
--
*Brian West* brian@freeswitch.org
*Twitter: @FreeSWITCH , @briankwest* http://www.freeswitchbook.com http://www.freeswitchcookbook.com
ClueCon 2015 Call for Speakers <https://www.cluecon.com/call-for-speakers/> | Register <https://freeswitch.com/cart.php?gid=1> TODAY! | Reddit: /r/freeswitch <https://www.reddit.com/r/freeswitch>
*T:*+19184209001 | *F:*+19184209002 | *M:*+1918424WEST (9378) *iNUM:*+883 5100 1420 9001 | *ISN:*410*543 | *Skype:*briankwest
_________________________________________________________________________ Professional FreeSWITCH Consulting Services: consulting@freeswitch.org http://www.freeswitchsolutions.com
Official FreeSWITCH Sites http://www.freeswitch.org http://confluence.freeswitch.org http://www.cluecon.com
FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
_________________________________________________________________________ Professional FreeSWITCH Consulting Services: consulting@freeswitch.org http://www.freeswitchsolutions.com
Official FreeSWITCH Sites http://www.freeswitch.org http://confluence.freeswitch.org http://www.cluecon.com
FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
_________________________________________________________________________ Professional FreeSWITCH Consulting Services: consulting@freeswitch.org http://www.freeswitchsolutions.com
Official FreeSWITCH Sites http://www.freeswitch.org http://confluence.freeswitch.org http://www.cluecon.com
FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org