Re: [msysGit] Re: [PATCH 12/12] [TODO] setup: bring changes from 4msysgit/next to next

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On Jul 2, 2008, at 9:32 PM, Johannes Sixt wrote:

On Mittwoch, 2. Juli 2008, Steffen Prohaska wrote:
On Jul 2, 2008, at 6:17 PM, Johannes Schindelin wrote:
On Wed, 2 Jul 2008, Steffen Prohaska wrote:
From: Johannes Sixt <johannes.sixt@xxxxxxxxxx>

Hannes,
You introduced "minoffset" in 861429a7c37c7.

AFAICT it was redone differently in 'next', because 'next' has this
ceiling dir thingie, which allows a different (much smaller) patch.

It might be more sensible to base your patch series on 'next'...

Hmm.. it is based on next.  But obviously I needed to merge
mingw's master to 4msysgit's master and resolve conflicts.
Maybe I made the wrong decisions then.

Hannes,
If you believe that your setup.c is good, then I'll copy your version
to 4msysgit's master.

The setup.c in mingw.git (and soon Junio's master) and Junio's next are
_different_, but both are correct. If you reverse-apply the patch you
presented here, then you get the version from Junio's next, which is a good
state.

Ok, I'll wait until Junio's master has the changes and will remove
the changes to 4msysgit then.

	Steffen

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux