2010/6/1 Chris Aniszczyk
<caniszczyk@xxxxxxxxx>
On Tue, Jun 1, 2010 at 1:33 PM, Shawn O. Pearce <
spearce@xxxxxxxxxxx> wrote:
> Long story short, if there are changes in master that aren't in
> stable-0.8 that you want in 0.8.x, they need to be merged over or
> cherry-picked, and they can't cause the IP log to change, so they
> must be only from committers.
Once the tags are in place, I'll publish the p2 repo for EGit and
maven repo for JGit.
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 :
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:
* [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).
Hope I didn't mess this up ;-)
