Re: [eigen] GitLab migration is starting now! |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/eigen Archives
]
- To: eigen@xxxxxxxxxxxxxxxxxxx
- Subject: Re: [eigen] GitLab migration is starting now!
- From: Martin Pecka <peci1@xxxxxxxxx>
- Date: Thu, 5 Dec 2019 20:11:44 +0100
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:references:to:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=dny+m3yy9euxKDOrBS4kssZvhqHl8TFxJDjRNWstpLo=; b=X0uGM65muV2LOE2WgpH89n14lxwlOmgsXrXSdm9Ln5eJS0OaIbt5gGFlkPadF2xooW i3UzDncIg61Na5RDxKg5MMXlL5vkiy96r72Rma0SOL6+CCoQQlFjrbbu1Xy7s5FdZznu oiOlTY6I8Sx1MsLLloC02aYJ3fk1DBFqFoj9Kec2xR3a0qKZWejPe/EPMQ6IhbVjIgy1 wAsarTMT6CA22wCmDejiC2NW9AAIhrQspP8UWYav6Kmys9gX5IVjVpuHZFkbm9xqJFFr 6EiDYPyf4MSFulQYS0LgbCgY72YjEhOxNuNGE48rwsNzo7q2Nx3c/eLTl/ib9BXsHvFa ijMw==
I succeeded creating MR !2 using git-remote hg.
For other people, here are the steps I needed to take on ubuntu. Suppose
I had a PR from branch my_pr_branch to target_branch on bitbucket. My
user account on both bitbucket and gitlab is peci1. These steps require
manually forking the gitlab repo before and having an SSH key set for
your user/fork.
sudo pip install git-remote-hg
git clone https://gitlab.com/libeigen/eigen.git
cd eigen
git remote add hg hg::https://peci1@xxxxxxxxxxxxx/eigen/eigen
git remote add hg-peci1 hg::https://peci1@xxxxxxxxxxxxx/peci1/eigen
git remote add peci1 git@xxxxxxxxxx:peci1/eigen.git
git fetch hg
git fetch hg-peci1
git fetch peci1
git checkout --track origin/target_branch
git checkout -b my_pr_branch
git log hg/branches/target_branch..hg-peci1/branches/my_pr_branch #
here you'll see hashes of all commits you made on this PR branch
# for each listed commit (from oldest to newest):
git cherry-pick <COMMIT_HASH>
git commit --amend --author="Martin Pecka <peci1@xxxxxxxxx>" # the
import changed my name to Unknown, so I changed it back
git push peci1 my_pr_branch
# send the Merge request
Dne 05. 12. 19 v 9:23 Gael Guennebaud napsal(a):
There are indeed quite a lot of open PR on bitbucket, and writing a
script to automatically migrate them on GitLab would have taken too
much effort. There are two options:
1 - either the PR author, or anyone else, redo the PRs he/she care
about on gitlab by hand and close the bitbucket PR with a respective
link (through raw diff/patch files, or maybe git-remote-hg if this
tools can fetch selected changesets)
2 - for simple PR that are unlikely to produce conflicts, we can also
continue the discussions on bitbucket and once ready an Eigen
maintainer will do the merge by hand (we used to do that quite often
anyways)
Any volunteer to write a little script adding such instruction to
every open PR? You can use my PR archiving script as a basis to see
how to loop over all PR:
https://gitlab.com/ggael/bitbucket-migration-tools/blob/master/archive_pullrequests.py
Gael
--
Martin Pecka
--
Martin Pecka