Getting Adium onto Github

[Thijs Alkemade]

On Thu, Feb 14, 2013 at 07:43:02PM -0500, Christian Doyle wrote:
> Did you happen to run git push origin master, or just git push origin?
> 
> git push origin (or whatever you happened to name your remote) will push
> all of the branches. In order to push the tags you will need to do git push
> origin --tags
> 

It wasn't a problem with git(hub), it was a problem with hg not updating the 
bookmarks (which determine what becomes a branch in git) automatically when 
new commits were pulled in. I've tracked this down to two problems:

Pulling from git suffered from this bug: 
https://bitbucket.org/durin42/hg-git/pull-request/14/when-branch_bookmark_suffix-is-set-fix/diff

Pulling from a remote hg repository will only update a bookmark if the 
server had that bookmark and changed it. I've updated hg on hg.adium.im to 
a version that supports bookmarks (in the yak shaving spree that followed, 
I've also updated trac, mercurial-server and hgweb), and pushed a bookmark 
for most of our currently open branches.

Thijs
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 938 bytes
Desc: not available
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20130215/fb1a49da/attachment.sig>