Hi Randy, On Mon, Nov 21, 2016 at 11:26:42AM -0800, Randy J. Ray wrote: > from the 3.1.0 tag. To make it even more interesting, I also have to apply > 1-2 upstream changes via "git cherry-pick", for things that are broken in > 3.1.0 but not planned for general release until they release 3.2.0 (there > is no plan for a 3.1.1, apparently).
Why don't you want to create a separate repo with the changes you need and use that instead of the upstream repository? From what you describe it feels like a number of extra change may increase (depending on their 3.2.0 schedule), so I'd just go with own repository hosted internally or publically, get the structure I need (3.1.0 branch + those cherries) and re-use what you have (to make things easier, I'd push 2.4 branch to that repo as well). -- Misha _______________________________________________ users mailing list users@buildbot.net https://lists.buildbot.net/mailman/listinfo/users