Upgrade Storagezotero and git submodules
Hi,
I am the maintainer of zotero and zotero-sa in Debian. I am having troubles with submodules workflow.
Here's my situation:
I have a master branch which is cloned from your zotero-standalone-build repository.
To update I normally do:
git pull origin --no-recurse-submodules
than
git submodule update --rebase --recursive
after that I merge the changes in my debian branch (with the debian folder).
Now I want to create a new branch (based on the 3.0.7 tag which is the current version of zotero in debian wheezy) called upstream-wheezy from my master branch.
The problem is that in the upstram-wheezy branch the submodules point to the same commit as in the master branch. If I now make the submodules point to the commit in relation to the 3.0.7 tag in the upstream-wheezy branch, in the master branch the submodules are pointing to the wrong commit.
Can someone explain and help me solving this workflow issue?
Cheers
Mike
I am the maintainer of zotero and zotero-sa in Debian. I am having troubles with submodules workflow.
Here's my situation:
I have a master branch which is cloned from your zotero-standalone-build repository.
To update I normally do:
git pull origin --no-recurse-submodules
than
git submodule update --rebase --recursive
after that I merge the changes in my debian branch (with the debian folder).
Now I want to create a new branch (based on the 3.0.7 tag which is the current version of zotero in debian wheezy) called upstream-wheezy from my master branch.
The problem is that in the upstram-wheezy branch the submodules point to the same commit as in the master branch. If I now make the submodules point to the commit in relation to the 3.0.7 tag in the upstream-wheezy branch, in the master branch the submodules are pointing to the wrong commit.
Can someone explain and help me solving this workflow issue?
Cheers
Mike
-
dstillmanNo, zotero-dev, the mailing list — follow the link. Deleting this.
This is an old discussion that has not been active in a long time. Before commenting here, you should strongly consider starting a new discussion instead. If you think the content of this discussion is still relevant, you can link to it from your new discussion.