From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14608 invoked by alias); 14 Oct 2011 13:07:43 -0000 Received: (qmail 14599 invoked by uid 22791); 14 Oct 2011 13:07:42 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp1.ugent.be (HELO smtp1.UGent.be) (157.193.71.182) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 14 Oct 2011 13:07:28 +0000 Received: from localhost (mcheck5.ugent.be [157.193.49.247]) by smtp1.UGent.be (Postfix) with ESMTP id 062433F6E2B; Fri, 14 Oct 2011 15:07:27 +0200 (CEST) Received: from smtp1.UGent.be ([157.193.71.182]) by localhost (mcheck5.UGent.be [157.193.43.11]) (amavisd-new, port 10024) with ESMTP id e9HAOIqgMoEw; Fri, 14 Oct 2011 15:07:26 +0200 (CEST) Received: from mail.elis.ugent.be (mail.elis.UGent.be [157.193.206.48]) by smtp1.UGent.be (Postfix) with ESMTP id 560EF3F6E09; Fri, 14 Oct 2011 15:07:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.elis.ugent.be (Postfix) with ESMTP id 3F901918F16; Fri, 14 Oct 2011 15:07:26 +0200 (CEST) Received: from mail.elis.ugent.be ([127.0.0.1]) by localhost (mail.elis.ugent.be [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kvIc3fTDXq9D; Fri, 14 Oct 2011 15:07:22 +0200 (CEST) Received: from bigmac.elis.UGent.be (bigmac.elis.UGent.be [157.193.206.33]) by mail.elis.ugent.be (Postfix) with ESMTP id 85031918F13; Fri, 14 Oct 2011 15:07:22 +0200 (CEST) Cc: Mark Kettenis , Eli Zaretskii , Phil Muldoon , gdb@sourceware.org Message-Id: <47656496-A338-44E2-8B98-82783D85FBD1@elis.ugent.be> From: Jonas Maebe To: Jan Kratochvil In-Reply-To: <20111014125356.GA15329@host1.jankratochvil.net> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v936) Subject: Re: GIT and CVS Date: Fri, 14 Oct 2011 13:07:00 -0000 References: <83r52g1rly.fsf@gnu.org> <83hb3ckn2s.fsf@gnu.org> <201110141022.p9EAMrUN030848@glazunov.sibelius.xs4all.nl> <20111014125356.GA15329@host1.jankratochvil.net> X-j-chkmail-Enveloppe: 4E98340E.000 from mail.elis.UGent.be/mail.elis.UGent.be/157.193.206.48/mail.elis.ugent.be/ X-j-chkmail-Score: MSGID : 4E98340E.000 on smtp1.UGent.be : j-chkmail score : . : R=. U=. O=. B=0.000 -> S=0.000 X-j-chkmail-Status: Ham X-IsSubscribed: yes Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org X-SW-Source: 2011-10/txt/msg00118.txt.bz2 On 14 Oct 2011, at 14:53, Jan Kratochvil wrote: > On Fri, 14 Oct 2011 12:22:53 +0200, Mark Kettenis wrote: >> (I've tried git stash, but it didn't seem to support my >> development style, at least "unstashing" didn't "just work" when I >> did >> a git fetch in between). > > I do so sometimes myself, it works. I believe some older git versions refused to "git stash pop" if there was any conflict between the stashed changes and the new source code (I remember struggling with that myself the first time I tried git). Current git versions will however apply the stash in case of conflicts and mark those conflicts. The only thing it does now in case of conflicts is not drop the original stash (i.e., "git stash pop" behaves like a "git stash apply") so that you can easily apply it again on a clean copy should you somehow mess up during conflict resolution. Jonas