X-Spam-Check-By: sourceware.org Message-ID: <4628BA1B.30802@byu.net> Date: Fri, 20 Apr 2007 07:03:23 -0600 From: Eric Blake User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.10) Gecko/20070221 Thunderbird/1.5.0.10 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: "Shawn O. Pearce" CC: cygwin@cygwin.com, git@vger.kernel.org Subject: Re: GIT vs Other: Need argument References: <20070417173007.GV2229@spearce.org> <462521C7.2050103@softax.com.pl> <200704172239.20124.andyparkins@gmail.com> <1176983993.30690.13.camel@cauchy.softax.local> <20070420062254.GB29069@spearce.org> In-Reply-To: <20070420062254.GB29069@spearce.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@cygwin.com Mail-Followup-To: cygwin@cygwin.com Delivered-To: mailing list cygwin@cygwin.com -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 According to Shawn O. Pearce on 4/20/2007 12:22 AM: >> Maybe it could be, if cygwin managed to create normal setup program >> one day... > > Yea. I've had a number of Git users get burned by the > git-merge-recursive script changing to git-merge-recursive.exe, > and Cygwin's installer left git-merge-recursive in the directory > when upgrading, but deleted some of the supporting Python modules. > So they were unable to execute a merge. Please report these sorts of bugs to the cygwin list, so that the cygwin team can be aware of them and work towards fixing them. > > Better, one user succeeded in doing a `git merge -s ours foo`, > completely tossing away the work of 20+ users over 3 months, > because their HEAD was very old and their merge-recursive was > utterly broken... They did not mean to do an ours style merge, it > just happened that merge-recursive didn't do squat... because it > was the old Python version, partially installed... > > I found out about the breakage only after those 20+ users managed > to cram another 80 or so commits onto the top of that bad merge. > Which meant that I couldn't just rewind the tree to redo the merge. > I actually had to redo the merge as a new commit ontop of the bad > history. Without losing any of the new changes. Ick. > > Thankfully just the week before I taught merge-recursive how to > take trees (and not commits), allowing me to use it to carry the > changes through whilest ignoring the bad merge base history. > > So anyway, my Git-on-Cygwin installer is now: > > ...on the master system... > make clean && > make prefix=/usr/local/git && > rm -rf /usr/local/git && > make install prefix=/usr/local/git && > tar jcf update-git.tar.bz2 /usr/local/git > > ...and on other systems... > cd / && > rm -rf /usr/local/git && > tar jxf update-git.tar.bz2 > > because dammit, that works, all of the time. Unlike Cygwin's > setup.exe. > - -- Don't work too hard, make some time for fun as well! Eric Blake ebb9@byu.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Cygwin) Comment: Public key at home.comcast.net/~ericblake/eblake.gpg Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGKLoa84KuGfSFAYARAlVwAKCL++zyeKO5iomF/gUQuRP6+N5qkgCfZpHa 3OrAwLmpJ4IbFpUiuj27jRw= =Dyjw -----END PGP SIGNATURE----- -- Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple Problem reports: http://cygwin.com/problems.html Documentation: http://cygwin.com/docs.html FAQ: http://cygwin.com/faq/