Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [geogig-dev] IMPORTANT: canonical repository moved to locationtech
If you have branches based off "master_old", I'm not sure what the best way to based them off "master" would be. What I'm doing is to
$git co branch
$git rebase master_old
$git co master -b branch_locationtech
and then either cherry pick the branch commits or
$git merge branch --squash
$git commit ....

Actually git does have a tool for this scenario.  The command is 'git rebase --onto locationtech/master boundless/master feature_branch" which essentially takes all the changes on feature_branch that are not on boundless/master and cherry-picks them onto locationtech/master'.  See http://git-scm.com/docs/git-rebase and search for the text '--onto' for a more verbose description.

On Mon, Nov 17, 2014 at 10:19 AM, Gabriel Roldan <groldan@xxxxxxxxxxxxxxxx> wrote:
Hi all,

this is a notification that the canonical GeoGig repository has been moved to the locationtech Github organization at https://github.com/locationtech/geogig.

NOTE however that the history is incompatible with the current master branch at boundlessgeo/geogig.

This is due to LocationTech requiring us to submit the so called "initial contribution" as a single commit, which as based off the "eclipse_initlal" tag at commit 8e5f210.

All subsequent commits from boundlessgeo/master have been cherry-picked.

This is somewhat inconvenient in that we lose history, but it's a price we got to pay in order to become a legit locationtech project.

In order to update your local clone proceed as follows:

$git remote add locationtech git@xxxxxxxxxx:locationtech/geogig.git
$git fetch locationtech
$git branch -m master master_old
$git checkout locationtech/master -b master

From now on, the locationtech one is the canonical GeoGig repository. The boundlessgeo/geogig one remains for historic purposes.

If you have branches based off "master_old", I'm not sure what the best way to based them off "master" would be. What I'm doing is to
$git co branch
$git rebase master_old
$git co master -b branch_locationtech
and then either cherry pick the branch commits or
$git merge branch --squash
$git commit ....

The one thing to take into account is that the whole old history is not carried over.


If you have any doubt, use this mailing list to ask any questions.

Best regards,
Gabriel


--

Gabriel Roldán
Software Developer | Boundless
groldan@xxxxxxxxxxxxxxxx
@boundlessgeo



_______________________________________________
geogig-dev mailing list
geogig-dev@xxxxxxxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
http://www.locationtech.org/mailman/listinfo/geogig-dev



--

Back to the top