4592, but first github????

classic Classic list List threaded Threaded
11 messages Options
Reply | Threaded
Open this post in threaded view
|

4592, but first github????

Phill Hogland
I have tried several times over the last year to figure out git on codeplex and more recently github work.  Admittedly with other distractions maybe I did not try very hard.  Over the years I have used VSS and SVN/Tortuous.  So today I re-read the various git tutorials and played with my GithubInc installation.

Several months ago I created a fork at : phillHgl/wix3
Today I figured out how to create a 'clone' of this fork.  (Simple really, I don't know what I was stumbling over in the past.)
I am not sure if this fork is up-to-date or if I need to do something.  
this link talks about doing 'git fetch upstream'

https://help.github.com/articles/syncing-a-fork/

Is that my next step?

Then from what I read I need to create a local branch (of my clone) specifically for working on bug 4592.  Is that the right idea?

I have been successful in the past at building debug versions of the wix source (using snapshot downloads).  I have read about creating release build, but need to work through those steps also.

My dev system has both VS2010 and VS2013 (but I use VS2013 and externally build using MSBuild) most of the time.
Reply | Threaded
Open this post in threaded view
|

Re: [SPAM] 4592, but first github????

Hoover, Jacob
If you are out of sync, you need to do the following.

1) From your dev machine, clone your fork. (You did this)
2) From that clone, add a second remote pointing to the official repo (assuming it's wix 3): < https://help.github.com/articles/configuring-a-remote-for-a-fork/ >
  git remote add upstream https://github.com/wixtoolset/wix3.git
3) Now you can fetch upstream changes to your dev machine.
 git fetch upstream
4) Assuming your develop branch is free of changes, then you should be able to do:
git checkout develop
git merge upstream/develop

Assuming all went well, you can now "git push develop" to push all the upstream changes to your fork.

The workflow I use, and which aligns whit what you are hinting at.  Create a feature branch off of develop.

git checkout develop
git checkout -b feat0001
<Do some work>
<Add/Commit your changes>
<Push your changes to origin (your fork)>
<Submit a pull request from github>

-----Original Message-----
From: Phill Hogland [mailto:[hidden email]]
Sent: Friday, November 14, 2014 3:47 PM
To: [hidden email]
Subject: [WiX-devs] [SPAM] 4592, but first github????

I have tried several times over the last year to figure out git on codeplex and more recently github work.  Admittedly with other distractions maybe I did not try very hard.  Over the years I have used VSS and SVN/Tortuous.  So today I re-read the various git tutorials and played with my GithubInc installation.

Several months ago I created a fork at : phillHgl/wix3 Today I figured out how to create a 'clone' of this fork.  (Simple really, I don't know what I was stumbling over in the past.) I am not sure if this fork is up-to-date or if I need to do something.  
this link talks about doing 'git fetch upstream'

https://help.github.com/articles/syncing-a-fork/

Is that my next step?

Then from what I read I need to create a local branch (of my clone) specifically for working on bug 4592.  Is that the right idea?

I have been successful in the past at building debug versions of the wix source (using snapshot downloads).  I have read about creating release build, but need to work through those steps also.

My dev system has both VS2010 and VS2013 (but I use VS2013 and externally build using MSBuild) most of the time.




--
View this message in context: http://windows-installer-xml-wix-toolset.687559.n2.nabble.com/4592-but-first-github-tp7597956.html
Sent from the wix-devs mailing list archive at Nabble.com.

------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/wix-devs

------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/wix-devs
Reply | Threaded
Open this post in threaded view
|

Re: 4592, but first github????

Phill Hogland
In reply to this post by Phill Hogland
I impatiently forged ahead, so please let me know if I am on the wrong course.

I did
git fetch upstream
git checkout develop  (tried master but that failed as 'unknown')
git merge upstream/develop
git checkout -b wix3_4592_RestartResource  (not sure if this complies with any particular convention, or matters)

Did not do:
$ git push origin [name_of_your_new_branch]   (should I?)
from here:
https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches

Then I modified the batch script I use for launching a debug build, but I thought the above was going to make a new folder tree, and I don't see it.  So maybe I should wait for some feedback.
Reply | Threaded
Open this post in threaded view
|

Re: 4592, but first github????

Phill Hogland
I just saw Jacob's post.  Thanks I will go over those steps again.
Reply | Threaded
Open this post in threaded view
|

Re: [SPAM] Re: 4592, but first github????

Bob Arnson-6
In reply to this post by Phill Hogland
On 14-Nov-14 18:29, Phill Hogland wrote:
> thought the above was going to make a new folder tree, and I don't see it.
Nope -- Git updates files, as needed, in place.

--
sig://boB
http://joyofsetup.com/

------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/wix-devs
Reply | Threaded
Open this post in threaded view
|

Re: [SPAM] 4592, but first github????

Phill Hogland
In reply to this post by Hoover, Jacob
2) From that clone, add a second remote pointing to the official repo (assuming it's wix 3): < https://help.github.com/articles/configuring-a-remote-for-a-fork/ >
  git remote add upstream https://github.com/wixtoolset/wix3.git

I did git branch -d [name of local branch] to get rid of what I had done earlier, which succeeded, and I also deleted my whole wix3 tree to start over.  I then used github (for windows) to create a new clone.

Now at this next step, it returns a fatal error, remote upstream already exists.

2) From that clone, add a second remote pointing to the official repo (assuming it's wix 3): < https://help.github.com/articles/configuring-a-remote-for-a-fork/ >
  git remote add upstream https://github.com/wixtoolset/wix3.git

Thanks for the help.
Reply | Threaded
Open this post in threaded view
|

Re: [SPAM] 4592, but first github????

Phill Hogland
git remote -v
shows two 'upstream' remotes a 'fetch' and a 'push'

I assume that this step was already done by the Github tool.
Reply | Threaded
Open this post in threaded view
|

Re: [SPAM] 4592, but first github????

Phill Hogland
All went well until:
git push develop

Now I have Fatal: you are pushing to remote 'develop, which is not the upstream of your current branch 'develop' without telling me what to push to update which remote branch.

So I guess I missed something at the 'create a second remote' step.

I'm running out of steam, and will be back tomorrow to try this out again.
Thanks again.
Reply | Threaded
Open this post in threaded view
|

Re: [SPAM] Re: [SPAM] 4592, but first github????

Hoover, Jacob
In reply to this post by Phill Hogland
As long as they are pointing to the right spot, all is good.

> On Nov 14, 2014, at 6:11 PM, "Phill Hogland" <[hidden email]> wrote:
>
> git remote -v
> shows two 'upstream' remotes a 'fetch' and a 'push'
>
> I assume that this step was already done by the Github tool.
>
>
>
> --
> View this message in context: http://windows-installer-xml-wix-toolset.687559.n2.nabble.com/4592-but-first-github-tp7597956p7597962.html
> Sent from the wix-devs mailing list archive at Nabble.com.
>
> ------------------------------------------------------------------------------
> Comprehensive Server Monitoring with Site24x7.
> Monitor 10 servers for $9/Month.
> Get alerted through email, SMS, voice calls or mobile push notifications.
> Take corrective actions from your mobile device.
> http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
> _______________________________________________
> WiX-devs mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/wix-devs

------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/wix-devs
Reply | Threaded
Open this post in threaded view
|

Re: [SPAM] Re: [SPAM] 4592, but first github????

Hoover, Jacob
In reply to this post by Phill Hogland
Try git push origin develop:develop

> On Nov 14, 2014, at 6:21 PM, "Phill Hogland" <[hidden email]> wrote:
>
> All went well until:
> git push develop
>
> Now I have Fatal: you are pushing to remote 'develop, which is not the
> upstream of your current branch 'develop' without telling me what to push to
> update which remote branch.
>
> So I guess I missed something at the 'create a second remote' step.
>
> I'm running out of steam, and will be back tomorrow to try this out again.
> Thanks again.
>
>
>
> --
> View this message in context: http://windows-installer-xml-wix-toolset.687559.n2.nabble.com/4592-but-first-github-tp7597956p7597963.html
> Sent from the wix-devs mailing list archive at Nabble.com.
>
> ------------------------------------------------------------------------------
> Comprehensive Server Monitoring with Site24x7.
> Monitor 10 servers for $9/Month.
> Get alerted through email, SMS, voice calls or mobile push notifications.
> Take corrective actions from your mobile device.
> http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
> _______________________________________________
> WiX-devs mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/wix-devs

------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/wix-devs
Reply | Threaded
Open this post in threaded view
|

Re: [SPAM] Re: [SPAM] 4592, but first github????

Phill Hogland
OK, I'm at the 'do some work' stage, so thanks for the help.  I will let you know how it goes after I do the debug build and some research.