Package: git-buildpackage
Version: 0.4.22
Severity: wishlist
If I call git-import-dsc for several versions successively --
~$ git-import-dsc python-ldap_2.3.1-1.dsc
~$ cd python-ldap
~/python-ldap$ git-import-dsc ../python-ldap_2.3.3-1.dsc
~/python-ldap$ git-import-dsc ../python-ldap_2.3.4-1.dsc
-- I get two disjointed branches:
o---o---o <-- upstream
\
o---o---o <-- master
The next time git-import-orig imports a new version, say 2.3.5, git will
think master is based on 2.3.1 (when in fact it is 2.3.4). It will try
to merge in changes between 2.3.1 and 2.3.4 that are already applied in
master, and the merge will usually fail.
What I'd like to get is a merge after each git-import-dsc:
o---o---o <-- upstream
\ \ \
o---o---o <-- master
So that, when 2.3.5 comes along, git merges just the difference between
2.3.4 and 2.3.5.
Hope that isn't too muddled. :-)
Thanks!
Matej
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
