2014. 7. 30. 오후 8:22에 "Philippe Coval" <[email protected]>님이 작성: > > On 07/26/2014 01:41 AM, Carsten Haitzler (The Rasterman) wrote: > > > >> The maintainer also needs to pay attention to two different solutions that do > >> not conflict with each other. > >> > >> Like I said, there are three strategies to deal with this: > >> - merge origin/upstream > >> - rebase on top of origin/upstream > >> - reset --hard origin/upstream > > The strategy I tend to apply is rebase on upstream > adapt or skip the conflict (in doubt) patches and bump the version in > spec file (or adapt) > but I keep tracking dropped patches in commit message... > > If the patch drop is causing issues (elsewhere?), > then a bug should be reported and developers could either > fix it in affected package or refresh (or create) a patch on top of > updated tizen branch > forward it upstream and track bugs id in commit message to help > co-maintainance > > The whole flow is explained from page 10 to 24 over there : > > http://www.slideshare.net/rzrfreefr/tizen-upstreamcooptdc2014pcoval > > > >> > >> The maintainer must know what patches were applied and how relevant they > >> still are. > This mean knowing history each use on each profile ? I am not > > I known mostly Tizen:Common a bit less Tizen:IVI but not a lot on T:Mobile > > I suppose only developers knew why it was proposed > without context (Bug-Tizen: in commit message) it's almost impossible.. > > To fix it I could open some bugs to track those patches and assign it to > author > I don't see other option for co maintainance. > > >> > >> If there are too many patches for the maintainer to know them all, we have a > >> different problem. > >> > Note yesterday, > I updated efl to latest release in sandbox/pcoval/latest > (and elm in progress too) > but I need to make sure it wont break existing packages, > since some patches were dropped on conflicts > > To sum up, track changes, forward upstream, drop changes on conflicts > and bother authors... > > Do we agrea on this ?
This is good to me. Existing patches should be patched into upstream and resolved by Jira. Only remain thing is merge schedule. I prefer to update upstream EFL frequently because upstream is developing many new features for Tizen 3.0 (e.g. Wayland). > > Later > > -- > mailto:[email protected] -- gpg:0x467094BC > xmpp:[email protected] > https://dockr.eurogiciel.fr/blogs/embedded/author/pcl/ > . > > > > _______________________________________________ > Dev mailing list > [email protected] > https://lists.tizen.org/listinfo/dev >
_______________________________________________ Dev mailing list [email protected] https://lists.tizen.org/listinfo/dev
