From: Petr Baudis <pasky@suse.cz>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: Russell King <rmk@arm.linux.org.uk>,
Linus Torvalds <torvalds@osdl.org>,
Wayne Scott <wsc9tt@gmail.com>,
git@vger.kernel.org
Subject: Re: bogus merges
Date: Mon, 12 Sep 2005 02:58:07 +0200 [thread overview]
Message-ID: <20050912005807.GI15630@pasky.or.cz> (raw)
In-Reply-To: <Pine.LNX.4.63.0509111256300.23242@iabervon.org>
Dear diary, on Sun, Sep 11, 2005 at 08:08:14PM CEST, I got a letter
where Daniel Barkalow <barkalow@iabervon.org> told me that...
> I think that the fundamental bug is that tree_timewrap() doesn't clear
> .git/merging, which means that it can still think you're doing a merge
> when you've started doing something else (such as doing further
> development after updating to someone else's merge of your tree).
Oh, nice catch. Thanks, fixed.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone. -- Alan Cox
next prev parent reply other threads:[~2005-09-12 0:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-05 14:38 bogus merges Wayne Scott
2005-09-05 16:01 ` Linus Torvalds
2005-09-06 13:08 ` Wayne Scott
2005-09-11 11:06 ` Russell King
2005-09-06 18:28 ` Daniel Barkalow
2005-09-11 11:01 ` Russell King
2005-09-11 18:08 ` Daniel Barkalow
2005-09-12 0:58 ` Petr Baudis [this message]
2005-09-11 10:21 ` Russell King
2005-09-11 11:48 ` Martin Langhoff
2005-09-11 15:11 ` A Large Angry SCM
2005-09-11 18:36 ` Russell King
2005-09-11 18:00 ` Russell King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050912005807.GI15630@pasky.or.cz \
--to=pasky@suse.cz \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=torvalds@osdl.org \
--cc=wsc9tt@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).