[wix-devs] WIXBUG4932 sent Pull Request to wix3, difficulty trying to do same for wix4

Mon Oct 26 12:07:39 PDT 2015

Ok, the fact that you are on develop, and it shows those files as Modified, means you were making changes locally to develop but have yet to commit them.

- Stash your changes
git stash
- Push your develop to your github develop
git push origin develop
- Switch to the branch you really wanted to do the work under
git checkout WIXBUG4932
- Apply the changes you previously stashed
git stash apply
- Commit the changes
git commit -m "Changes for WIXBUG4932..."
- Push the changes to your feature branch
git push origin WIXBUG4932

-----Original Message-----
From: wix-devs [mailto:wix-devs-bounces at lists.wixtoolset.org] On Behalf Of Phill Hogland
Sent: Monday, October 26, 2015 1:45 PM
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Subject: Re: [wix-devs] WIXBUG4932 sent Pull Request to wix3, difficulty trying to do same for wix4

Thanks for the instructions:

For Background:
When I started on Saturday, in GitHub Desktop, I select my 'wix3' Repository, and selected the'develop' Branch' and then I clicked on "Update from wixtoolset/develop", and it pulled down a lot of files, etc (as I had Windows Explorer viewing the local repository folders at the time.  Currently when I go to that 'Update' button it says that 'develop' is up to date.  On Saturday I then made a new branch from wix3/develop (I thought) named WIXBUG4932 and made changes.   (So that is background info only.)

Based on your instructions, I did:
git checkout develop
      It responded with:
      M  <path to files that I changed on Saturday>  <five paths>
      Already on 'develop'
      Your branch is ahead of the 'origin/develop' by 320 comits.
        (use "git push" to publish you local commits)

It is true that I worked on a submission many months ago and only tried to update on Saturday.

Then I did:
git pull https://github.com/wixtoolset/wix3.git develop git commit -m "Merged upstream"
   fatal: No such remote or remote group: https://github.com/wixtoolset/wix3.git

Also looking at this in GitHub Desktop it shows a 'history' for "Merge remote-traking branch'refs/remotes/wixtoolset/develop' into develop.
There is a 'Revert' button, is that what I need to use?

Thanks for the help.
Phill

-----Original Message-----
From: wix-devs [mailto:wix-devs-bounces at lists.wixtoolset.org] On Behalf Of Hoover, Jacob
Sent: Monday, October 26, 2015 1:16 PM
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Subject: Re: [wix-devs] WIXBUG4932 sent Pull Request to wix3, difficulty trying to do same for wix4

For your wix3, it doesn't seem like you've updated it in a long time.  IE, your develop branch is 319 commits behind.  From what I can tell, the only thing in 3.x that you've committed is the merge commit where you merged upstream/develop to your bug branch.  You may have done the second commit locally for your 3.x changes, but forgot to push.  If you do a "git log FETCH_HEAD..HEAD" while on your 3.x feature branch, it should tell you if you have commits you neglected to push.

To update your develop, to be current with upstream develop:
  https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/

git checkout develop
git pull https://github.com/wixtoolset/wix3.git develop git commit -m "Merged upstream"
git push origin develop

Normally I would start by configuring the official source as upstream, via https://help.github.com/articles/configuring-a-remote-for-a-fork/

git remote add upstream https://github.com/wixtoolset/wix3.git

Once you have upstream configured, you can then simplify a bit.

git checkout develop
git pull upstream develop
git commit -m "Merged upstream"
git push origin develop

-----Original Message-----
From: wix-devs [mailto:wix-devs-bounces at lists.wixtoolset.org] On Behalf Of Phill Hogland
Sent: Monday, October 26, 2015 12:37 PM
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Subject: Re: [wix-devs] WIXBUG4932 sent Pull Request to wix3, difficulty trying to do same for wix4

They do each have different root folders (both on wix github and local, wix3 and wix4).

After what I tried this morning there is a 'view on Github' that shows the commit to the wix4 tree, and a different 'view on Github' for my commit to the wix3 tree.  Actually the wix4 commit looks correct (but I think something is wrong with what happened for wix3).  I suspect I did the sync to the upstream fork at the wrong point so the wix3 commit has a lot of stuff not related to my changes.  Should I just delete that branch and start over?

PhillHgl

-----Original Message-----
From: wix-devs [mailto:wix-devs-bounces at lists.wixtoolset.org] On Behalf Of Hoover, Jacob
Sent: Monday, October 26, 2015 12:25 PM
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Subject: Re: [wix-devs] WIXBUG4932 sent Pull Request to wix3, difficulty trying to do same for wix4

You need to push your changes (to GihHub) before submitting a pull request.  As for 3.x vs 4.x conflicts, assuming both have a unique root folder, you won't have any issues.

-----Original Message-----
From: wix-devs [mailto:wix-devs-bounces at lists.wixtoolset.org] On Behalf Of John Cooper
Sent: Monday, October 26, 2015 11:44 AM
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Subject: Re: [wix-devs] WIXBUG4932 sent Pull Request to wix3, difficulty trying to do same for wix4

Staging is doing some like:

Git add some_path_to_filename

>From the command line, you can see unstaged files by running:

Git status

--
John Merryweather Cooper
Senior Software Engineer | Integration Development Group | Enterprise Notification Service Jack Henry & Associates, Inc.® | Lenexa, KS  66214 | Ext:  431050 |JoCooper at jackhenry.com

-----Original Message-----
From: wix-devs [mailto:wix-devs-bounces at lists.wixtoolset.org] On Behalf Of Phill Hogland
Sent: Monday, October 26, 2015 11:41 AM
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Subject: Re: [wix-devs] WIXBUG4932 sent Pull Request to wix3, difficulty trying to do same for wix4

The e-mail below is from an external source.  Please do not open attachments or click links from an unknown or suspicious origin.

OK thanks.  I was not sure what 'stage' meant but I read in Github help and found that on the display of the eleven changes there is a 'grayed' Commit to WIXBUG4932 button.  So I filled in that info and hit the button.  It worked.  Then I did the pull request and that failed.  I am a little concerned that the commit that I am trying to do to my fork of the wix4\develop tree is tromping on my fork of the wix3\develop tree maybe because I used the same WIXBUG4932 name.  But I wam really not sureof what I am doing with git (GitHub.  I just don't want to mess anything up on the wix git site.

-----Original Message-----
From: wix-devs [mailto:wix-devs-bounces at lists.wixtoolset.org] On Behalf Of Heath Stewart
Sent: Monday, October 26, 2015 11:28 AM
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Subject: Re: [wix-devs] WIXBUG4932 sent Pull Request to wix3, difficulty trying to do same for wix4

Did you stage your changes before you commit? Alternatively, you can use "git commit -a" to commit all staged and unstaged changes.

Heath Stewart
Visual Studio, Microsoft
http://blogs.msdn.com/heaths

-----Original Message-----
From: wix-devs [mailto:wix-devs-bounces at lists.wixtoolset.org] On Behalf Of Phill Hogland
Sent: Sunday, October 25, 2015 1:24 PM
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Subject: [wix-devs] WIXBUG4932 sent Pull Request to wix3, difficulty trying to do same for wix4

Yesterday I revived my wix3 dev sandbox, made the changes for WIXBUG 4932, committed and sent a PR.  It all went so smooth that today I decided to try my hand at wix4.  I created a wix4 fork, and then used Github desktop to create a local clone and then a branch for implementing the same changes as in 4932.  The initial build of wix4 went fine (except that at the end of the build while creating the Summary Detail MSBuild through an exception indicating that multiple compares do not get the same result).  I save the text of the error message, but since I have not seen it again after several builds, I am ignoring it.

So I made the changes for 4932, in the wix4 source, and checked them over, and then tried to commit them and then submit a pull request.  The PR dialog says that there is nothing to commit so it won't enable sending the PR, admittedly I only noticed this after several confused tries, so maybe something was sent.   Github desktop shows 11 changes.   I am not sure if I caused a problem by using similar names or where the issue is.

Any advice is appreciated!
Phill

____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant https://na01.safelinks.protection.outlook.com/?url=http%3a%2f%2fwww.firegiant.com%2f&data=01%7c01%7cHeath.Stewart%40microsoft.com%7cac1ad3216d8e4f008e2908d2dd7a45b8%7c72f988bf86f141af91ab2d7cd011db47%7c1&sdata=F9GV6pwWa%2b5QLua6XGZS6K73b4U1p30AHX%2ftEFELweU%3d
____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/ ____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/

NOTICE: This electronic mail message and any files transmitted with it are intended exclusively for the individual or entity to which it is addressed. The message, together with any attachment, may contain confidential and/or privileged information.
Any unauthorized review, use, printing, saving, copying, disclosure or distribution is strictly prohibited. If you have received this message in error, please immediately advise the sender by reply email and delete all copies.

____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/ ____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/ ____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/ ____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/ ____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/