On 10.02.2012 09:26, ext anatoly techtonik wrote:
But does that mean that contributions with missing agreements will go
into new Gerrit repository unless Github repo is reuploaded from scratch?
No, and yes. :-) Good that you brought it up.
I first tried to remove the individual commits missing the agreements,
but couldn't do that cleanly (morale of the story: always perform
rebases, not merges, in Git). Our current plan is as follows.
1. Undo the offending patches on top of the existing Gitorious repos
(DONE, in my gitorious clones).
2. The history is cut and a clean copy is imported to Gerrit (waiting to
be done).
3. File bugs against the broken/missing features in Jira
4. Merge my Gitorious clones back to Gitorious main repos
At this point, we have the new repos with no history in Gerrit, and the
full history available in Gitorious. Then, in case anyone (and I'm sure
there will be many) wants to access the full history, we can provide
scripts that seamlessly graft the two repos together.
After that, it's business as usual (except that everything happens in
the Qt Project framework). The new commits currently residing in Github
can be applied on top of the Gerrit repo, the bugs about broken/missing
features fixed, etc.
So, in this case we're eating the cake and having it too. :-)
Cheers,
ma.
_______________________________________________
PySide mailing list
[email protected]
http://lists.pyside.org/listinfo/pyside
