search

midgardproject / midgardmvc_installer

Standalone installer for MidgardMVC applications
GNU Lesser General Public License v2.1
5 stars 0 forks source link

pake task for quick-merging upstream changes to local clone #5

Open bergie opened 13 years ago

bergie commented 13 years ago

Related to #3

sorry if I'm using wrong terminology or something, I'm not really familiar with the "true git way".

In github the "fork queue" is a very brittle way to merge more than a few changes from upstream to your local repo, OTOH from command-line doing "remote add" "fetch" "merge remote local" -dance works fine, we need a script that automates this so people using the "developement mode" (see link) can easily get all the upstream changes.

This script should merge all the branches that the upstream has to corresponding local ones and create local copies for any missing (basically get the local fork into same state as the upstream [with local changes remaining])

(moved from https://github.com/midgardproject/midgardmvc_core/issues/issue/32)

indeyets commented 13 years ago

merging "all the branches that the upstream has to corresponding local ones" sounds like overkill.

won't merging branch of component specified in application.yml be enough? that sounds like the only true upstream branch of component.

or is there real need for getting all branches of each upstream component and creating their local counterparts?

rambo commented 13 years ago

Actually I meant this script to be used on the component checkout level so not for all branches of all components (or even components listed on the application.yml) and probably if upstream has gazillion branches we can limit the merging to the "master" or the one corresponding the current local branch.