Git repo ready!

[John Ralls]

On Mar 12, 2011, at 1:44 AM, Christian Stimming wrote:

> Am Samstag, 12. März 2011 schrieb John Ralls:
>> On Mar 11, 2011, at 2:06 PM, Christian Stimming wrote:
>>> Am Freitag, 11. März 2011 schrieb John Ralls:
>>>> On Mar 11, 2011, at 7:06 AM, Derek Atkins wrote:
>>>>> John Ralls <jralls at ceridwen.us> writes:
>>>>>>> However, I think the git repo is missing many of the recent tags,
>>>>>>> e.g. the 2.4.3 tag. Maybe you need to run "git push --tags" or
>>>>>>> something similar so that the tags are actually pushed?
>>> 
>>> Err... how do I pull those newly pushed tags in my local repo? "git pull"
>>> et al doesn't seem to do that.
>> 
>> git fetch --tags
> 
> Sorry to bug you again, but the tags (e.g. 2.4.3) seem to belong to a 
> different branch than origin/master. Do I see the same repo as you do? On my 
> local repo, origin/master is 4d1754d2492c8b3118418b0c378feda5e71053aa "Updated 
> Dutch translation ..."
> but the tag 2.4.3 is 
> e2d71eb340534907c0b2e69e3f4acf2490beb09f where instead it should be something 
> right next to c6314a4aa5c6923bbf7c54247c52950a4987758f "Only show the Save As 
> dialog..."
> 
> If that means you must push a new master, this is completely fine with me. 
> After all, this is why we've allowed this larger testing period for us.

Christian,

There is no master unless you create it (I recommend in the wiki article that you create it as a tracking branch on trunk). The main branch is "trunk", and that's the branch you should have checked out when you commit back to subversion (until we set up the 2.4 branch, at which point you'll be able to commit back to that branch as well).

I don't know what repo you're looking at; let's look at what's on Github. Select 2.4.3 from the "switch tags" dropdown, then switch to the "commits" view.

Tag 2.4.3 is e2d71eb, but that's just the git tag, which is created by the mirror program. It has two parents, a2974eaca and 88c6a5be.  a2974eaca is the actual subversion tag, r20337 (click on the hash to go to its tree-view, then on the hash again to see the commit message). Its parent is 4a2c2f16, which is r20336, updating the version number in configure.ac, 
whose parent is your r20334, update German translation. (20335 was in htdocs). So far, so good. Back to e2d71eb. It has two parents, and the second one, 88c6a5be, is r20344. Phil had to retag 2.4.3, and the second tag is r20345, so this looks correct, too. It's not perfect: It would be better if the second parent of e2d71eb was r30345, but it's close enough that I don't think it's worth tracking down and fixing. If it looks weird in gitk, well, lots of things can look weird in gitk.

Regards,
John Ralls