John,
I find the wireless-testing GIT has been rebased twice in less than one
month. Does it mean you give up making it a long lived merge-able tree?
This may affect to the downstream wireless drivers code management. At
least for iwlwifi, we'd expect to merge with wireless-testing everytime.
Thanks,
-yi
On Tue, Sep 09, 2008 at 08:47:34AM +0300, Kalle Valo wrote:
> John W. Linville <[email protected]> writes:
>
> > On Mon, Sep 08, 2008 at 03:24:58PM +0800, Zhu Yi wrote:
> >
> >> I find the wireless-testing GIT has been rebased twice in less than one
> >> month. Does it mean you give up making it a long lived merge-able tree?
> >> This may affect to the downstream wireless drivers code management. At
> >> least for iwlwifi, we'd expect to merge with wireless-testing everytime.
> >
> > There must be some mistake, it has not been rebased at all -- at
> > least not as far as git is concerned. I have done my now customary
> > "revert everything, pull from Linus re-apply" thing that I call a
> > virtual rebase, but the history has remained continuous.
> >
> > The non-master branches do get rebased of course. Perhaps you saw
> > that and thought that master had been rebased as well?
>
> FWIW, I also have had conflicts while pulling wireless-testing#master
> and I similarly thought that you have rebased it. But if you didn't I
> don't know what happened.
It is possible that I mistakenly copied the wrong tree out there or
something like that -- it has happened occasionally. Generally I know
when I've done that and correct it immediately, but it is possible
that it happened and the wrong tree was sitting under wireless-testing
for a day or two. If so, then I apologize.
John
On Mon, Sep 08, 2008 at 03:24:58PM +0800, Zhu Yi wrote:
> I find the wireless-testing GIT has been rebased twice in less than one
> month. Does it mean you give up making it a long lived merge-able tree?
> This may affect to the downstream wireless drivers code management. At
> least for iwlwifi, we'd expect to merge with wireless-testing everytime.
There must be some mistake, it has not been rebased at all -- at
least not as far as git is concerned. I have done my now customary
"revert everything, pull from Linus re-apply" thing that I call a
virtual rebase, but the history has remained continuous.
The non-master branches do get rebased of course. Perhaps you saw
that and thought that master had been rebased as well?
John
--
John W. Linville
[email protected]
John W. Linville <[email protected]> writes:
> On Mon, Sep 08, 2008 at 03:24:58PM +0800, Zhu Yi wrote:
>
>> I find the wireless-testing GIT has been rebased twice in less than one
>> month. Does it mean you give up making it a long lived merge-able tree?
>> This may affect to the downstream wireless drivers code management. At
>> least for iwlwifi, we'd expect to merge with wireless-testing everytime.
>
> There must be some mistake, it has not been rebased at all -- at
> least not as far as git is concerned. I have done my now customary
> "revert everything, pull from Linus re-apply" thing that I call a
> virtual rebase, but the history has remained continuous.
>
> The non-master branches do get rebased of course. Perhaps you saw
> that and thought that master had been rebased as well?
FWIW, I also have had conflicts while pulling wireless-testing#master
and I similarly thought that you have rebased it. But if you didn't I
don't know what happened.
--
Kalle Valo