I really don't know what this is I made a patch for 5.3 (sources + NEWS) with a commit I made a patch for 5.4 (sources + NEWS) with a commit (I did not use merge, it was 2 distinct commits) I merge 5.4 into master I push to origin
I've followed the git faq on the wiki (the config are all set correctly) and now I don't understand why there is a modification of NEWS on master while this file is not supposed to be merged between branches. Is it just an impression of GIT is just over complicated ? god I miss svn :/ So if my commits are wrong, feel free to fix because I don't even know if there's a problem or if it's all OK thx ++ fat 2012/5/22 Jérôme Loyet <f...@php.net> > gnurf ? wtf ? > > I'm sorry guys for this NEWS modification on master. It was not supposed > to be. I hate GIT ... it was so much clear and easy with SVN. I'll try to > fix this but not sure to know how to ... > > ++ fat > > > 2012/5/22 Jérôme Loyet <f...@php.net> > >> Commit: d1e529c1cba17bed376833ab0a4c785a251abf02 >> Author: Jerome Loyet <f...@php.net> Tue, 22 May 2012 08:38:09 >> +0200 >> Parents: 074d361d647b0fba334e5e14d3b6904ba1ea09d8 >> Branches: master >> >> Link: >> http://git.php.net/?p=php-src.git;a=commitdiff;h=d1e529c1cba17bed376833ab0a4c785a251abf02 >> >> Log: >> - fix NEWS for bug #61812 >> >> Bugs: >> https://bugs.php.net/61812 >> >> Changed paths: >> M NEWS >> >> >> Diff: >> diff --git a/NEWS b/NEWS >> index 68f0a35..dd31dde 100644 >> --- a/NEWS >> +++ b/NEWS >> @@ -47,6 +47,9 @@ PHP >> NEWS >> - Phar: >> . Fix bug #61065 (Secunia SA44335). (Rasmus) >> >> +- Pgsql: >> + . Added pg_escape_identifier/pg_escape_literal. (Yasuo Ohgaki) >> + >> - Reflection: >> . Implemented FR #61602 (Allow access to the name of constant >> used as function/method parameter's default value). ( >> reeze....@gmail.com) >> >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php >> >> >
