Merge ~logan/ubuntu/+source/scim-chewing:merge into ~usd-import-team/ubuntu/+source/scim-chewing:debian/sid
| Status: | Needs review |
|---|---|
| Proposed branch: | ~logan/ubuntu/+source/scim-chewing:merge |
| Merge into: | ~usd-import-team/ubuntu/+source/scim-chewing:debian/sid |
| Diff against target: |
470 lines (+318/-2) 6 files modified
debian/changelog (+272/-0) debian/control (+4/-1) debian/im-switch/scim-chewing (+18/-0) debian/rules (+8/-1) debian/scim-chewing.postinst (+9/-0) debian/scim-chewing.prerm (+7/-0) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Server Dev import team | 2017-07-18 | Pending | |
|
Review via email:
|
|||
| Scott Moser (smoser) wrote : | # |
| Scott Moser (smoser) wrote : | # |
Or were you just wanting a review of your merge before uploading to Ubuntu ?
| Logan Rosen (logan) wrote : | # |
Hey Scott,
Maybe I'm misunderstanding the merge process, as documented on this wiki page: https:/
I deconstructed the delta and then performed a merge of the latest version from Debian. And now I'm requesting a merge of my changes back into the Git repo.
If I just upload my merge, won't I lose the work I did on deconstructing the delta?
Thanks,
Logan
| Robie Basak (racb) wrote : | # |
Hi Logan,
> If I just upload my merge, won't I lose the work I did on deconstructing the delta?
We're calling this idea "preserving rich history". The importer is designed to be able to do it, but there are a bunch of manual steps and race conditions in between us and full integration to Launchpad for this right now.
Temporarily, what needs to happen is that a member of ~usd-import-team must push an "upload tag" to the importer repository before the importer's next run picks up your upload into Launchpad. This allows the importer to "see" your rich history and incorporate it. For example, we could push the upload tag before you dput. If the tag is pushed later, then it'll still be available from the repository, but won't be integrated into the official commit graph until we re-run the importer (we're planning to re-run, mutating all commits, at least once before we make everything "final").
Does that make sense?
You can create the upload tag using "git ubuntu tag --upload", push it somewhere, and then request from somebody in ~usd-import-team that we push the tag before you upload that commit. We don't have a formal process for requesting this right now. IRC or an MP like this one is fine - but please make it clear that you'd like an upload tag pushed so we know exactly what you're requesting, since these MPs are also being used by non-uploaders to request sponsorship and for peer review between uploaders within the Canonical server team.
If your upload is subsequently rejected (say because there's an error in debian/changelog), then ~usd-import-team has to manually delete the tag to redo it, until we fix the integration.
If the tip of your merge branch is definitely identical to what to will dput, then I can happily create and push the tag for you. Let me know.
Hope that helps!
Unmerged commits
- 1283173... by Logan Rosen on 2017-07-18
- c882a19... by Logan Rosen on 2017-07-18
- 4537ad3... by Logan Rosen on 2017-07-18
- 19d10ee... by Logan Rosen on 2017-07-18
- 75ec934... by Logan Rosen on 2017-07-18
- 907d77a... by Logan Rosen on 2017-07-18
- 42630b9... by Logan Rosen on 2017-07-18
- 523092d... by Logan Rosen on 2017-07-18
- b9e26b7... by Logan Rosen on 2017-07-18
- f346863... by Logan Rosen on 2017-07-18


Hi, /git.launchpad. net/usd- importer/ tree/gitubuntu/ import- cron-packages. txt
It looks like this is just a import (result of running 'git ubuntu import').
If thats the case, then what we want is to add this package to
https:/
so that it will continue to happen.
And I can just run 'scim-chewing' to manually update it this time.
Does that sound right?