Re: [egit-dev] Tagging 0.8.X

[Matthias Sohn <matthias.sohn@xxxxxxxxxxxxxx>]

2010/6/2 Matthias Sohn <matthias.sohn@xxxxxxxxxxxxxx>

We wanted to add 3 egit patches for inclusion into 0.8.0, 

I cherry-picked them on my local stable-0.8 branch and pushed them to gerrit, 

but only 2 of them were pushed. 

I have no idea why the first of these 3 commits wasn't pushed.

Here how it looks on my local stable-0.8 branch :

egit (stable-0.8)$ git log --graph --oneline

* 87813be Show untracked files per default and remember last selection

* 366d177 Import wizard does not remember last wizard

* 90fa517 Missing Push URI

* 17a3909 Specify the Gerrit Code Review URL in our IP log

* 65f5bc3 Denote EGit consumes JGit in the project IP log

* 2193487 Update cache of IPzilla CQ 3905

* 8dcf9d3 RepositorySearchDialog: String Externalization

*   3fe5ae1 Merge "Extract public class RepositoryCache from GitProjectData"

|\

| * 506fb7a Extract public class RepositoryCache from GitProjectData

* |   6948fee Merge "Project org.eclipse.egit.doc does not need Java nature"

|\ \

| * | 5124817 Project org.eclipse.egit.doc does not need Java nature

* | | eb8f1fc Update EGit eclipse help from wiki

these two arrived at gerrit as changes 787 and 788:

* 87813be Show untracked files per default and remember last selection

* 366d177 Import wizard does not remember last wizard

but this one didn't :

* 90fa517 Missing Push URI

here the log of my push :

egit (stable-0.8)$ git push ssh://msohn@xxxxxxxxxxxxxxxx:29418/egit.git HEAD:refs/for/stable-0.8

Enter passphrase for key '/c/Documents and Settings/d029788/.ssh/id_rsa':

Counting objects: 53, done.

Delta compression using up to 2 threads.

Compressing objects: 100% (24/24), done.

Writing objects: 100% (36/36), 3.09 KiB, done.

Total 36 (delta 21), reused 0 (delta 0)

remote:

remote: New Changes:

remote:   http://egit.eclipse.org/r/787

remote:   http://egit.eclipse.org/r/788

remote:

To ssh://msohn@xxxxxxxxxxxxxxxx:29418/egit.git

 * [new branch]      HEAD -> refs/for/stable-0.8

In order to include the documentation updates I also pushed 

them to stable-0.8 (change 789).

Attached these 4 changes exported as a patch series using git format-patch.

Maybe this helps to fix the problem with the not-pushed change (0001-Missing-Push-URI.patch). 

-- 
Matthias

Attachment: 0001-Missing-Push-URI.patch
Description: Binary data

Attachment: 0002-Import-wizard-does-not-remember-last-wizard.patch
Description: Binary data

Attachment: 0003-Show-untracked-files-per-default-and-remember-last-s.patch
Description: Binary data

Attachment: 0004-Update-egit-help-for-0.8.0-from-wiki.patch
Description: Binary data