I use remotes in my wix workflow.. I have my origin point at my fork, and then
I add the official repo as upstream. This allows me to pull upstream changes,
merge them into my wix39 branch, switch to my feature branch, and rebase it.
I’ve just tested, and it does give a warning but allowed me to create a single
repository with multiple remotes of two entirely related projects. I still
don’t think there is value in creating a repository per version unless the vast
majority of the source diverges.
From: Rob Mensching [mailto:r...@robmensching.com]
Sent: Thursday, February 06, 2014 4:26 PM
To: WiX toolset developer mailing list
Subject: Re: [WiX-devs] The Great GitHub Discussion
The whitespace issues are perplexing. At this point, it seems files keep having
whitespace changes as I switch branches. I don’t truly understand the root
problem (something that bothers me significantly) but my understanding is that
the actual Git repository(the .git folder) has mixed line endings all over the
place and that is causing problems. I’ve spent *a lot* of time fumbling around
trying to get all the files sorted out once and for all. At this point, I don’t
have time to put into messing with it more and would rather focus on moving
forward… the whitespace is basically just a forcing function.
The expectation is that starting from scratch means the .gitattributes file
will be put in place *before* the repository is created and ensure everything
is consistent from commit #1.
If multiple remotes work across repo’s then I would happily stand corrected.
<smile/> I have to admit I haven’t tried it with remotes.
From: Hoover, Jacob [mailto:jacob.hoo...@greenheck.com]
Sent: Thursday, February 6, 2014 1:06 PM
To: WiX toolset developer mailing list
Subject: Re: [WiX-devs] The Great GitHub Discussion
I’m confused why we would have to lose anything in the history… Can someone
give a reproducible example of where the CRLF settings aren’t working? If all
branches have been fixed, and the .gitattributes are in place, this should be
impossible to happen in the future. (Changing to a “fresh” repo with no history
doesn’t do anything to prevent the same issues.)
Also, I’d challenge point two. You can have multiple remotes, so in theory you
could have an origin (your private fork), along with an upstream3 and upstream4.
From: Heath Stewart [mailto:hea...@outlook.com]
Sent: Thursday, February 06, 2014 2:25 PM
To: WiX toolset developer mailing list
Subject: Re: [WiX-devs] The Great GitHub Discussion
Would you merge all pull requests first?
Sent from my Windows Phone
________________________________
From: rjvdb...@gmail.com<mailto:rjvdb...@gmail.com>
Sent: 2/6/2014 11:48 AM
To: WiX toolset developer mailing list<mailto:wix-devs@lists.sourceforge.net>
Subject: Re: [WiX-devs] The Great GitHub Discussion
I concur with Wes.
Robert
From: Wesley Manning<mailto:wmann...@dynagen.ca>
Sent: Thursday, February 6, 2014 8:40 PM
To: WiX toolset developer mailing list<mailto:wix-devs@lists.sourceforge.net>
My vote: don’t care but leaning towards moving now. Better to get it over with.
Wes
From: Rob Mensching [mailto:r...@robmensching.com]
Sent: February-06-14 2:52 PM
To: WiX toolset developer mailing list
Subject: [WiX-devs] The Great GitHub Discussion
In today’s WiX Online Meeting http://youtu.be/4QlCTgmS33Y (about minute 10) I
spent about 15 minutes talking about the reasons to move to GitHub. At this
point, I believe it is inevitable that we will move the question is when and
what it should look like when we move.
First, in the move we’ll be breaking history. We’ll start from scratch to clean
up our messy history and get the crazy whitespace issues all sorted out (the
problem driving this move). That means when we do this, you’ll have to go to a
different repo to go fully back in time. Keep that in mind reading on.
When.
When do you think we should move? Should we go now in the middle of v3.9 and
v4.0? Should we wait to move when each next version (v3.10 and v4.1) is ready
to start?
I already have a couple votes (thank you Blair and Bruce) for moving basically
now. I’m looking for more opinions. Even if your opinion is “It doesn’t matter
to me.” Voting helps me get a good idea what people want.
What.
As mentioned in the Online Meeting (if you haven’t listened yet, please do),
GitHub provides a few new degrees of freedom. The biggest is that we have an
“umbrella organization” that can own multiple repositories. Today, on CodePlex,
we have to squish all of our stuff into a single repository which is
unfortunate. Some examples what GitHub would allow us to do:
1. Create a repo for the “website”. I think this is a pretty obvious move
and will make it clearer where to go to improve content on
http://wixtoolset.org/.
2. Create a repo per major version of WiX toolset. In other words, there
would be “wix3” and “wix4” repos. This would allow us to use “master” branch
correctly (wix3 repo master branch would hold v3.8) and “develop” branch (wix3
repo develop branch would hold v3.9). That sounds great to me but there is a
downside. You’d no longer be able to have one repo on disk and switch between
all versions of the WiX toolset. Personally, I don’t work that way anyway (I
have separate folders with wix39 and wix40 on my machine) but it’s something we
should discuss here.
Anyway, please vote for when and if you have thoughts on how to organize our
code in GitHub let’s discuss them.
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wix-devs
