On 12-02-29 at 12:06pm, Kiwamu Okabe wrote: > Dear Jonas, > > On Wed, Feb 29, 2012 at 12:35 AM, Jonas Smedegaard <dr@jones.dk> wrote: > > ...but then I notice that commits are missing from other branches. > > > > I suspect that you are only tracking the main "master" branch, > > probably because you did a simple "git clone ..." initially. > > > > First, please push your changes to "upstream" and "pristine-tar" > > branches. There is two ways to do that: a) if you are certain that > > you have not created any new custom branches locally, do "git push > > --all". Alternatively (assuming your remote is named "origin" as is > > the default) do "git push origin upstream; git push origin > > pristine-tar" to explicitly push only those branches. > > Sorry, I pushed it. Looks good now. ...and really, you shouldn't be sorry about any of this: It was common mistakes, and I am your friend, not a strict teacher or something :-) > > Then, when all changes in all branches of your git are pushed to our > > shared git, I recommend that you change your git to properly track > > all three branches - so that in the future "git status" checks them > > all and only "git push" is needed to push all branches. You can > > explicitly do some special git commands or manually edit .git/config > > directly - or you can do the easy approach: erase your local git and > > make a fresh clone like this: > > > > gbp-clone --pristine-tar git.debian.org:/git/collab-maint/pandoc > > Sorry, I don't know gbp-clone. #orz > Now I use the copy with below command. > > gbp-clone --pristine-tar kiwamu-guest@git.debian.org:/git/collab-maint/pandoc Your login will be equal across all Debian packaging gits. Instead of hardcoding at each of them you can instead add this to ~/.ssh/config: Host *.debian.org *.debian.net User kiwami-guest > > Ideally CDBS would support other types of checksums too, and support > > consulting a separate file potentially containing checksums from > > multiple releases (so that an upstream maintained checksum file > > could be fetched and used as-is). Suggestions on how to model that > > (choice of filenames etc.) is much appreciated. I don't expect > > actual implentation to require much effort. > > Umm,,, I will try to think about better method. Great. Thanks! > Is the "support other types of checksums" documented? No, CDBS has no documentation at all, currently :-/ - Jonas -- * Jonas Smedegaard - idealist & Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private
Attachment:
signature.asc
Description: Digital signature