Hi, Good idea to move this to developers list...
> Well, good idea but I think trunk and drifted to far apart to manage this. > > As a first shot I would assume we copy the stable to a "new trunk" and > merge all the stuff from the current trunk that is not intended for 1.0 > again. > Then trunk and branch are more related again as they are now. Hm, i don't really know because i wasn't able to produce a list of changesets missing in one of the branches, but my guess is that it's even harder to port everything from trunk to a copy of the 1.0 branch, because of much more changes went to trunk only (by reason). Changes is trunk are more "revolutionary", introducing big subsystems like routerboard or kernel 2.6. Changes in the 1.0 branch are "evolutionary", fixing bugs or changing smaller subsystems like the ifup-down script. The situation is not as bad as my first mail might suggest, the problem is "simply" _finding_ the missing changesets. If somebody is able to produce a list of them, merging should not require manual intervention too often. As a starting point, i created a diff of trunk against freewrt_1_0. It's 18MB unpacked, but many space is used by binary madwifi junk. Here you are: http://freewrt.org/~ulmen/freewrt_trunk_vs_1_0.diff.bz2 > And yes, I think I committed a lot stuff without this discipline yet and > directly to 1.0. mea culpa. Shame on you! Chleudert den Purschen zu Poden! You can shift the guilt by helping to fix the problem ;). Regards, -- Lothar Gesslein <[EMAIL PROTECTED]>
signature.asc
Description: This is a digitally signed message part
_______________________________________________ freewrt-developers mailing list [email protected] https://www.freewrt.org/lists/listinfo/freewrt-developers
