Re: [leaf-devel] Merges commit in next

2012-08-26 Thread KP Kirchdoerfer
Am 26.08.2012 17:01, schrieb Yves Blusseau: > > Le 26 août 2012 à 16:47, KP Kirchdoerfer a écrit : > >> Am 26.08.2012 16:33, schrieb Yves Blusseau: > > 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 a

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread Yves Blusseau
Le 26 août 2012 à 16:47, KP Kirchdoerfer a écrit : > Am 26.08.2012 16:33, schrieb Yves Blusseau: 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 i

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread KP Kirchdoerfer
Am 26.08.2012 16:33, schrieb Yves Blusseau: >>> >>> 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 b

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread Yves Blusseau
>> >> 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 yo

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread KP Kirchdoerfer
Am 26.08.2012 15:02, schrieb Yves Blusseau: > > 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

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread Yves Blusseau
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 >>> s

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread Andrew
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

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread 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

[leaf-devel] Merges commit in next

2012-08-26 Thread 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 you