On 2013-01-16 10:41, Philippe Gerum wrote: > On 01/16/2013 09:44 AM, Jan Kiszka wrote: >> On 2013-01-16 09:02, Jan Kiszka wrote: >>> At the same time, upstream should not pull or pick in >>> a way that makes life harder for downstream. >> >> Philippe, in the future, please keep your public tree up-to-date, >> ideally at a daily base. I'm seeing commits there that were done locally >> more than a week ago. Only publishing your state will avoid the problems >> you faced with integrating our changes. > > No. If I don't publish, there must be a reason.
This approach doesn't work very well - to state it carefully. Push you stuff at least into a public "next" branch, one that may be rebased / reordered without warning. That allows us to prepare for what is under test, maybe pick up arch-specific changes into the subsystem queues. And don't complain about conflict if you cherry-pick subsystem patches without dropping a note to the author - or was Gilles aware of your private queue? Jan -- Siemens AG, Corporate Technology, CT RTC ITP SDP-DE Corporate Competence Center Embedded Linux _______________________________________________ Xenomai mailing list [email protected] http://www.xenomai.org/mailman/listinfo/xenomai
