Re: [leaf-devel] LEAF rebase/merge

[Yves Blusseau]

Hi Erich,

the best is to merge the new-initrd branch into the maint or master.
In either case (merge or rebase) you need to resolve the conflicts.
There are no other alternative.

Yves

> Le 14 janv. 2016 à 08:10, Erich Titl  a écrit :
> 
> Hi Yves
> 
> KP has asked me to port my stuff from new-initrd to master. I would like
> to do that with a minimum of manual intervention, but I am a bit stuck
> with the way the LEAF project is built within the git repository.
> 
> The branch new-initrd is branched off tag 5.2.2. In the meantime maint
> and master have progressed. Now to me it would be logical to rebase
> new-initrd to maint before trying to either merge it to master or
> cherrypick the few changes. The thing that puzzles me most is the fact
> that some configuration files have changed names in the meantime, which
> will make a clean merge impossible.
> 
> I also read that rebasing a published branch is frowned upon.
> 
> What would you suggest to overcome all this?
> 
> Thanks
> 
> Erich


--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Re: [leaf-devel] LEAF rebase/merge

[Erich Titl]

Hi Yves

Am 14.01.2016 um 09:10 schrieb Yves Blusseau:
> Hi Erich,
> 
> the best is to merge the new-initrd branch into the maint or master.
> In either case (merge or rebase) you need to resolve the conflicts.
> There are no other alternative.

Pretty disappointing :-(

Is there a best practise strategy to avoid conflicts? With Git conflicts
appear to be inherent.

cheers

Erich



--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

[leaf-devel] LEAF Project

[Erich Titl]

Hi Folks

I just looked at leaf.sourceforge.net and was wondering

Created on 2003-02-04 10:24:27 by install
Updated on 2005-08-24 11:48:30 by mhnoyes

Latest news:

LEAF Bering-uClibc maintenance update 4.3.3 released

Wouldn't we think that the release of 5.2.3 it worth a note?
Should we not remove the links to Lince, Oxygen and WISP-Dist?
Has there really not been anything worth a change of the web site since
2005?

I believe we need to address this, else even the best software would go
unnoticed.

cheers

ET

--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Re: [leaf-devel] LEAF rebase/merge

[Erich Titl]

Hi Andrew

Am 14.01.2016 um 11:04 schrieb Andrew:
> Hi.
> 
> Git conflict appears when there's two modifications of same code in 
> merged branches.
> 
> So only case of avoiding it - don't touch code which is modified in 
> other branch, that is impossible in real world :)

So I thought, anyway I am trying not to disturb too much

cheers

ET

--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

[leaf-devel] Leaf master branch

[Erich Titl]

Hi Folks

In my effort to port new-initrd to master I looked at the linux directory

Why do we have config files for 4.1 and 4.4 plus the corresponding tarballs?
Shouldn't we make the config files release agnostic?

cheers

ET

--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Re: [leaf-devel] LEAF rebase/merge

[Andrew]

Hi.

Git conflict appears when there's two modifications of same code in 
merged branches.

So only case of avoiding it - don't touch code which is modified in 
other branch, that is impossible in real world :)

14.01.2016 10:20, Erich Titl пишет:
> Hi Yves
>
> Am 14.01.2016 um 09:10 schrieb Yves Blusseau:
>> Hi Erich,
>>
>> the best is to merge the new-initrd branch into the maint or master.
>> In either case (merge or rebase) you need to resolve the conflicts.
>> There are no other alternative.
> Pretty disappointing :-(
>
> Is there a best practise strategy to avoid conflicts? With Git conflicts
> appear to be inherent.
>
> cheers
>
> Erich
>
>
>
> --
> Site24x7 APM Insight: Get Deep Visibility into Application Performance
> APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
> Monitor end-to-end web transactions and take corrective actions now
> Troubleshoot faster and improve end-user experience. Signup Now!
> http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140
>
> ___
> leaf-devel mailing list
> leaf-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/leaf-devel


--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Re: [leaf-devel] Leaf master branch

[kp kirchdoerfer]

Am Donnerstag, 14. Januar 2016, 09:49:05 schrieb Erich Titl:
> Hi Folks
> 
> In my effort to port new-initrd to master I looked at the linux directory
> 
> Why do we have config files for 4.1 and 4.4 plus the corresponding tarballs?
> Shouldn't we make the config files release agnostic?


It is useful/necessary to keep those files at least for a transition period 
until we support new kernel for every toolchain. Currently armv6 for the 
raspberry is a problem, so a 4.1 kernel will be kept.

kp

--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Re: [leaf-devel] Leaf master branch

[Erich Titl]

Hi KP

Am 14.01.2016 um 15:45 schrieb kp kirchdoerfer:
> Am Donnerstag, 14. Januar 2016, 09:49:05 schrieb Erich Titl:
>> Hi Folks
>>
>> In my effort to port new-initrd to master I looked at the linux directory
>>
>> Why do we have config files for 4.1 and 4.4 plus the corresponding tarballs?
>> Shouldn't we make the config files release agnostic?
> 
> 
> It is useful/necessary to keep those files at least for a transition period 
> until we support new kernel for every toolchain. Currently armv6 for the 
> raspberry is a problem, so a 4.1 kernel will be kept.

Why don't we let Git handle the versions, just make a kernel-4.1 tag and
be done.

cheers

ET



--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel