Re: Bug#662632: RFS: libaio-ocaml/1.0~rc1
"Bernhard R. Link" <brlink@debian.org> writes:
> * Goswin von Brederlow <goswin-v-b@web.de> [120311 19:51]:
>> git-dpm?
> http://git-dpm.alioth.debian.org/
> http://wiki.debian.org/PackagingWithGit/GitDpm
>
>> > That would still make git think that your upstream branch is based on
>> > your master branch and thus has the modification "remove debian/" in it
>> > which git will want to merge with any debian changes in the upstream
>> > branch once you merge the two.
>>
>> That was the merge. After that there is nothing more to merge. And the
>> next merge will do the same git-import-orig + merge -s ours trick.
>
> But how do you get a new upstream code into master? If you try to update
> upstream and merge it in master, it will think you want to remove
> debian/
>
> Bernhard R. Link
I am upstream and I edit master so the code is already in master. The
job is getting it into upstream when I roll the orig.tar.gz. So before
upload I now run:
@set -e; \
if git tag | grep -q "^upsteam/$(UPSTREAM_VERSION)$$"; then \
echo "Upstream $(UPSTREAM_VERSION) already exists."; \
else \
echo "Creating $(ORIG_NAME) ..."; \
git archive --format=tar.gz --output=$(ORIG_NAME) \
--prefix=$(SOURCE)-$(UPSTREAM_VERSION)/ \
--worktree-attributes HEAD; \
git-import-orig --no-merge --pristine-tar \
--upstream-version=$(UPSTREAM_VERSION) \
$(ORIG_NAME); \
echo "Merging into upstream"; \
git checkout upstream; \
git merge -s ours master; \
git checkout master; \
fi
@echo "Tagging release debian/$(VERSION)"
@git tag "debian/$(VERSION)"
Those 2 checkouts can be avoided if I adopt the import+merge in one go
magic from openafs but for the libaio-ocaml 1.0-1 upload the above is
what I did.
MfG
Goswin
Reply to: