Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:73641 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 23536 invoked from network); 8 Apr 2014 16:12:38 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 8 Apr 2014 16:12:38 -0000 Authentication-Results: pb1.pair.com header.from=tyra3l@gmail.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=tyra3l@gmail.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.216.46 as permitted sender) X-PHP-List-Original-Sender: tyra3l@gmail.com X-Host-Fingerprint: 209.85.216.46 mail-qa0-f46.google.com Received: from [209.85.216.46] ([209.85.216.46:39723] helo=mail-qa0-f46.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id A6/33-07254-5FF14435 for ; Tue, 08 Apr 2014 12:12:37 -0400 Received: by mail-qa0-f46.google.com with SMTP id i13so1137054qae.5 for ; Tue, 08 Apr 2014 09:12:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=TmALpZjphSi4qBXcY9d02xC7X/zvQwJEZpC0zmcuvpY=; b=WhHtvkaV6+5qNbs18yDMdyA4U8G4Kd/nDKXJJ4gp6S89mGYW5mZLGNvZrvgzwQObKs Ji8bGjZaglrmppNP16a0mcOnx/A3S1DeqIpyAqjcadC3ZJ0OqOAso7B44XNF4EfmzPue +OnYiYhuVXTGcs61/XKd+WGDsFKkgzCArcjrq2Cc98YGESvPfbPtgaGTPcQ8IBsm5RYG TyWMQiwH7lVwUyTEpcgOKeknWULStXTstrUR9Xw26EN570VWZ3TlJxjoI0a5E1c2407E dFIYSGRhCK5kH9fRn64LlyeobBgQc3t4ye0GSLGbZriR0v083BGwBOKR9vGktzW4q6zI AbSg== MIME-Version: 1.0 X-Received: by 10.224.171.200 with SMTP id i8mr5723374qaz.96.1396973554088; Tue, 08 Apr 2014 09:12:34 -0700 (PDT) Received: by 10.140.17.34 with HTTP; Tue, 8 Apr 2014 09:12:34 -0700 (PDT) In-Reply-To: References: Date: Tue, 8 Apr 2014 18:12:34 +0200 Message-ID: To: marius adrian popa Cc: PHP Developers Mailing List Content-Type: multipart/alternative; boundary=001a11c2ca8873c2db04f68a400a Subject: Re: [PHP-DEV] merge and push master karma issues From: tyra3l@gmail.com (Ferenc Kovacs) --001a11c2ca8873c2db04f68a400a Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Tue, Apr 8, 2014 at 5:37 PM, marius adrian popa wrote= : > I could merge and push until the master branch (5.4->5.5->5.6) > > git merge --no-ff --log PHP-5.6 > Merge made by the 'recursive' strategy. > > git push origin master > Username for 'https://git.php.net': mariuz > Password for 'https://mariuz@git.php.net': > Counting objects: 1, done. > Writing objects: 100% (1/1), 302 bytes | 0 bytes/s, done. > Total 1 (delta 0), reused 0 (delta 0) > remote: Welcome mariuz. > remote: You have insufficient Karma! > remote: I'm sorry, I cannot allow you to write to > remote: php-src.git/ > remote: Have a nice day. > To https://git.php.net/push/php-src.git > ! [remote rejected] master -> master (pre-receive hook declined) > error: failed to push some refs to 'https://git.php.net/push/php-src.git' > > -- > PHP Internals - PHP Runtime Development Mailing List > To unsubscribe, visit: http://www.php.net/unsub.php > > hi, it seems you only have karma for the following: - pecl/pdo_firebird - php-src.git/ext/interbase - php-src.git/ext/pdo_firebird - php-src.git/NEWS - phpdoc - playground.git so you will only be able to push your merge if you only happen to have changes for those directories. my guess is that somebody pushed something to one of the lower branches, then forgot to merge it upwards, so when you merged upward, you ended up merging those changes, but you don't have karma for those files/dirs. --=20 Ferenc Kov=C3=A1cs @Tyr43l - http://tyrael.hu --001a11c2ca8873c2db04f68a400a--