Le 26 août 2012 à 12:10, Andrew a écrit : > 26.08.2012 12:20, KP Kirchdoerfer пишет: >> Hi Yves; >> >> Am 26.08.2012 10:40, schrieb Yves Blusseau: >>> Hi >>> >>> @KP, like the merge commit in master, your last merge commit (f010890d) is >>> really strange: >>> Merge branch 'next' of >>> ssh://leaf.git.sourceforge.net/gitroot/leaf/bering-uclibc into next >>> >>> In next we must only see merge from master or topic branches. I don't >>> understand this merge.. >>> Perhaps your next and master branch was not in sync with remote repository. >>> If you can do: >>> git checkout master >>> git reset --hard origin/master >>> git checkout next >>> git reset --hard origin/next >>> >>> and don't use git pull to update your local branches but git pull --rebase >>> -p >>> I use this alias: git config --global alias.gpr 'pull --rebase -p' >> I thought I followed the recipes closely and it looked all well on the >> commandline. >> I'll record it the next time :) >> >>> @Andrew, can you push your topic branch that enable awk in BusyBox (a >>> branch like yournick/enable-bb-awk) ? >>> So anybody can merge the topic branch in master if we all think that >>> enabling awk in bb is good. >>> We need also a topic branch to merge in integration branch (we must not use >>> the cherry-pick command if possible) >>> >>> For upnp, i've revert the binutils package and i will make some tests… >> Andrew provided a fix in branch next. >> >> kp > Right. > > Yves, I saw that you reverted binutils upgrade. I committed fix for upnpd > into next branch > (it was trivial), so maybe we can switch again to 2.22? >
So good ! Yes i will switch again 2.22. But if all is ok we can merge the commit into master (with the "same" parent). So andrew can you commit your topic branch directly into master (no cherry-pick). You must merge the same topic branch that you use to commit into next. If your made changes directly into next it's really bad, because we can't merge next into master and using cherry-pick can cause problem (http://dan.bravender.us/2011/10/20/Why_cherry-picking_should_not_be_part_of_a_normal_git_workflow.html). If so alway made a topic branch (fork off from master for example) for all you think to put into next. Regards, Yves ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
