-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 alex fixed that
Am 30.03.12 15:08, schrieb Laruence: > Hi: Today I make a fix which is only affect 5.3's test . after > fix, I pushed it. > > then I do a fake merge(merge -s ours) in 5.4, then when I try to > push it.. > > I got an error: > > remote: We cannot figure out what you comitted! To > g...@git.php.net:php-src.git ! [remote rejected] PHP-5.4 -> PHP-5.4 > (pre-receive hook declined) > > then I have to make a trivial change to avoid this.. > > is this a bug? or what should I do in such case? :) > > > thanks -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJPdfcoAAoJEAT0aMuPE7Z1aokP/i8/q5860XgBFJRLQfx3QQT6 Z5WbQGbnixllQrSKV6ywPZ8/ccM2j0KmT3Ei3d3jycfb8CMcwcJIiTX6UHwbBKxk dnI7/ZlOPW/6LNMn4aw/JW+kTi7CzJRDdox3J/C8aWOyurXUOGnR6sj8xuxKlAjK ivJVaag0TRRYENA9VQodA2wzOMUWAMCTPh6CXevnv577tAana3U+qAgS6IjH8V9G zJTsLf6m+wYjhAEyRDig9Ha/10Ty/kgtwmYo0lqU4UT60Zq5870by08j7vtODatk XtYzHGK88+59VHEQpNLBOiVCutPgTIVdYGC+UEtuwSqi5nOB4dRdMZxxm4kwqiEk pGgMfmG6WDrJCb2P4hkzkqcjDDobDt4WdjEzScqDqvJKWSmVncBJkDag+EkAuM2Q uKFq9By2xaQyDsQ4qqFd4AJl7srZ8l1m+Ge5HrCthflGQKYaJ21tQzlUQ7dhKJrl LvnwfSyIivFIcu+CY4vPqCZmtcyGpB9QWNycFLszn7A4mKNtfFpZCzWPKtu1dOn4 6dreVmZcZ0tBZgD9hytZtv1oQypEB+4A4foKV5jhdNciZ6/fJxBjFQ4pDf64M6Ic 6hDvhixWJSjQzQSDVcuJbDngmGDn5yKMEkwPr3nynlWfH/Ndwy/bEGc9hdqU2ZXh DIdAPzFAwAo7EXb6g39O =Pl9S -----END PGP SIGNATURE----- -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
