[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take
From: |
Charles Wilson |
Subject: |
Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6) |
Date: |
Sat, 28 Aug 2010 01:10:25 -0400 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.8.1.23) Gecko/20090812 Thunderbird/2.0.0.23 Mnenhy/0.7.6.666 |
On 8/27/2010 3:47 PM, Ralf Wildenhues wrote:
> * Charles Wilson wrote on Fri, Aug 27, 2010 at 08:49:24PM CEST:
>> However, once I have finished the requested changes above and the
>> rebasing (plus whatever comes of the four open ***QQQ***uestions), I
>> might ask for a 12 hour halt on updates to master so I can run those
>> tests, if that's ok?
>
> Why should you need the halt? If there are new pushs in the meantime,
> you just merge origin/master into your master, and push.
Doesn't that mess up the "linear" history of commits in the upstream
master? After the push, we want master to look like this, right:
+ master (head): chuck's lastest commit
+ the next most recent commit
+ older commits
+ ...
Not this:
+ master (head): merge from chuck's local master
+ more recent master commit
+ some other master commit
+++ (chuck's local master): chuck's latest commit
+ master commit just before chuck began his final testing
+ older commits
Or am I confused about how git handles a merge on a single (tracking)
branch?
--
Chuck
- Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), (continued)
Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Roumen Petrov, 2010/08/26
- Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Charles Wilson, 2010/08/26
- Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Peter Rosin, 2010/08/27
- Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Peter Rosin, 2010/08/27
- Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Roumen Petrov, 2010/08/29
- Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Peter Rosin, 2010/08/31
Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Charles Wilson, 2010/08/27
Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Charles Wilson, 2010/08/28
Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Ralf Wildenhues, 2010/08/28
Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Charles Wilson, 2010/08/28
Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Peter Rosin, 2010/08/29
Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Charles Wilson, 2010/08/29
Re: [PATCH] [cygwin|mingw]: Add cross-compile support to cwrapper (take 6), Ralf Wildenhues, 2010/08/27