Git is distributed; the repositories are all completely independent copies. As
such, you can work on multiple features locally each in their own feature
branch and then push all or one of the feature branches in question to your
fork on codeplex.
My personal strategy is to locally tie my repository to both my codeplex fork
and the wix fork (git remote add upstream https://git01.codeplex.com/wix && git
fetch upstream && git branch upwix38 upstream/wix38). By doing this, I can
easily merge in changes from the upstream wix branches.
I also prefer to maintain my own wix38 branch as a direct copy of upstream
wix38, so I can easily get those changes into the feature branches I've been
working on (git checkout upwix38 && git pull && git checkout wix38 && git merge
upwix38).
To get any branch back on your codeplex fork, you need to push them from your
local repository to origin (git push wix38 origin/wix38).
And finally, if I have several commits in a feature branch and I am ready to
submit them for a pull request I prefer a squash rebase of the feature branch
via my updated wix38 branch.
Create an integration branch to rebase (I create a .# branch per pull request,
to preserve the original work that was done. Rebasing is DESTRUCTIVE if you
don't have another branch/tag tied to it.)
git branch BUG####.1 BUG####
Squash all commits, this is in effect rewriting the history of the integration
branch, into a single commit.
git rebase -i BUG####.1
Push your squashed commit in order to send a pull request and get a code review.
git push BUG####.1 origin/BUG####.1
Note, this is just how I do things and they work for me. Git doesn't impose
any real workflow decisions, so you can do just about anything you want with
them. It also wouldn't hurt to verify the commands as these are all off the top
of my head. As long as your branches are pushed to your fork, anything you do
locally to those branches can be undone by removing the local branch and
re-pulling the one from your fork. I also never make any feature commits to
the upwix38/wix38 branches, so those merges are just fast forwards.
From: Christopher Painter [mailto:chr...@iswix.com]
Sent: Monday, September 30, 2013 2:27 PM
To: Windows Installer XML toolset developer mailing list; Windows Installer XML
toolset developer mailing list
Subject: Re: [WiX-devs] [SPAM] Re: [SPAM] Re: [SPAM] Re: Interested in helping
on 3.8
I created a fork on codeplex and made the seemingly incorrect assumption that I
was essentially creating a fork off the 38 branch. In fact I was forking
everything and still had to do the git checkout wix38 (using Tortoise Git
though ).
Using other tools such as Clearcase and TFS I'm used to creating workspaces for
my different branches / views. The concept of cloning and then switching was
very weird to me. The performance using cached objects seemed really nice
though.
________________________________
From: "Hoover, Jacob"
<jacob.hoo...@greenheck.com<mailto:jacob.hoo...@greenheck.com>>
Sent: Monday, September 30, 2013 2:19 PM
To: "Windows Installer XML toolset developer mailing list"
<wix-devs@lists.sourceforge.net<mailto:wix-devs@lists.sourceforge.net>>
Subject: Re: [WiX-devs] [SPAM] Re: [SPAM] Re: [SPAM] Re: Interested in helping
on 3.8
As far as git goes, I'd start with http://git-scm.com/book/en/Getting-Started
The short version is after you've installed git, you should be able to:
1) Open your git bash
2) Navigate to where you would like the git source to go
3) git clone https://git01.codeplex.com/wix
4) cd wix
5) git checkout wix38
Note, if you plan on making changes and submitting them upstream, the process
is different. You need to create a fork on codeplex and then clone it.
-----Original Message-----
From: Phill Hogland [mailto:phogl...@rimage.com]
Sent: Monday, September 30, 2013 10:10 AM
To: wix-devs@lists.sourceforge.net<mailto:wix-devs@lists.sourceforge.net>
Subject: [WiX-devs] [SPAM] Re: [SPAM] Re: [SPAM] Re: Interested in helping on
3.8
I would just like to inject a couple of comments to this thread, based on my
current research into using VS2013 to build the Wix 3.8 source.
1) I do not have any prior experience with git and still have not figured it
out. I started working on it several weeks ago to get the Wix 3.8 source and
before I got it working I discovered that I could just go to wix.codeplex.com,
select the version of Wix source that I wanted and click download to get the
source. But I know I still have to figure out git at some point in the future.
2) One of the issues in my 'VS2013 to build Wix 3.8' testing is that the
VS2013 install did not include the VS shell, so when using the standard shell
there some errors related to cl.exe is missing dependencies on mspdb100.dll. I
had noticed at work similar errors when I did not use the
VS2010 shell. So after Internet research I found that VS2010 shell runs a bat
which adds the path to this dependency to %PATH%, which was the same step that
I needed to do to get my VS2013 build to work in this regard.
3) I created build.cmd and buildInitialization.cmd scripts to make it easier to
launch my various build tests and create logs as I work on debugging different
build issues. The buildInitialization.cmd script has code that only calls the
msbuild OneTimeWixBuildInitialization.proj if the user is an elevated user, and
if not reports that the script failed because elevated privileges are needed.
There is more work needed to make these scripts work at any path, but maybe at
some point we could help users in this manner.
--
View this message in context:
http://windows-installer-xml-wix-toolset.687559.n2.nabble.com/SPAM-Re-SPAM-Re-Interested-in-helping-on-3-8-tp7589298p7589303.html
Sent from the wix-devs mailing list archive at Nabble.com.
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net<mailto:WiX-devs@lists.sourceforge.net>
https://lists.sourceforge.net/lists/listinfo/wix-devs
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net<mailto:WiX-devs@lists.sourceforge.net>
https://lists.sourceforge.net/lists/listinfo/wix-devs
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wix-devs
