git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
To: Junio C Hamano <junkio@cox.net>
Cc: Linus Torvalds <torvalds@osdl.org>,
	git@vger.kernel.org,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 4/3] Fold get_merge_bases_clean() into get_merge_bases()
Date: Sun, 02 Jul 2006 22:59:07 +0200	[thread overview]
Message-ID: <44A8339B.7070608@lsrfire.ath.cx> (raw)
In-Reply-To: <7vmzbr50b3.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano schrieb:
> Rene Scharfe <rene.scharfe@lsrfire.ath.cx> writes:
> 
>>> I suspect the only way to fix that is to make "get_merge_bases()" not use 
>>> UNINTERESTING at all, but instead just explicitly use something like
>> No and yes.  Patch 1 in the 3+1 series changes the flags used in
>> commit.c to not conflict with the ones in revision.h[*].  So we have two
>> different UNINTERESTINGs, and get_merge_bases() doesn't mess up the
>> show/no-show markings.
> 
> Gaah.  commit.c defines its own UNINTERESTING and you rely on
> not including revision.h which is ... gasp ... #$@#$!!!

You mean crap?  Yes, it is.  That's why I said we should centralize the
commit flags.  There are several duplicate names for different commit
flags in different files.  I couldn't come up with a clean solution, though.

I have an idea.  Would it help to gather a list of all commit object
flags from the different files?  And then we would come up with unique
names?  And then move the definition of all of them to commit.h?

René

  reply	other threads:[~2006-07-02 20:59 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-01  2:44 A note on merging conflicts Linus Torvalds
2006-07-01  3:08 ` Junio C Hamano
2006-07-01  3:54   ` Linus Torvalds
2006-07-01  3:59     ` Linus Torvalds
2006-07-01 15:09     ` Rene Scharfe
2006-07-01 15:23       ` Johannes Schindelin
2006-07-01 16:25       ` Linus Torvalds
2006-07-01 18:13         ` Rene Scharfe
2006-07-01 18:01       ` J. Bruce Fields
2006-07-01 18:20         ` Linus Torvalds
2006-07-01 22:24           ` Daniel Barkalow
2006-07-01 22:57             ` Linus Torvalds
2006-07-01 23:25               ` Daniel Barkalow
2006-07-01 23:45                 ` Daniel Barkalow
2006-07-02 11:31                   ` Rene Scharfe
2006-07-02 21:42                     ` Daniel Barkalow
2006-07-02  0:08                 ` Linus Torvalds
2006-07-01 18:22         ` Jakub Narebski
2006-07-01 18:52           ` Linus Torvalds
2006-07-01 18:37       ` Junio C Hamano
2006-07-01 19:29         ` Rene Scharfe
2006-07-01 19:56           ` Junio C Hamano
2006-07-01 23:01             ` Johannes Schindelin
2006-07-01 20:04           ` Linus Torvalds
2006-07-01 20:07             ` Junio C Hamano
2006-07-01 20:14               ` Junio C Hamano
2006-07-01 23:29                 ` [PATCH 1/3] Add get_merge_bases_clean() Rene Scharfe
2006-07-01 23:43                   ` Johannes Schindelin
2006-07-01 23:29                 ` [PATCH 2/3] Add '...' operator for revisions Rene Scharfe
2006-07-01 23:29                 ` [PATCH 3/3] Make clear_commit_marks() clean harder Rene Scharfe
2006-07-03  9:32                   ` Junio C Hamano
2006-07-03 13:56                     ` Johannes Schindelin
2006-07-03 17:05                       ` Linus Torvalds
2006-07-03 21:08                         ` Johannes Schindelin
2006-07-03 19:47                       ` Junio C Hamano
2006-07-03 21:12                         ` Johannes Schindelin
2006-07-03 22:55                           ` Linus Torvalds
2006-07-04  7:53                             ` Johannes Schindelin
2006-07-04  8:20                               ` Junio C Hamano
2006-07-02  9:49                 ` [PATCH 4/3] Fold get_merge_bases_clean() into get_merge_bases() Rene Scharfe
2006-07-02  9:56                   ` Johannes Schindelin
2006-07-02 16:43                   ` Linus Torvalds
2006-07-02 17:40                     ` Rene Scharfe
2006-07-02 18:28                       ` Junio C Hamano
2006-07-02 20:59                         ` Rene Scharfe [this message]
2006-07-02 21:15                           ` Rene Scharfe
2006-07-02 21:17                           ` Linus Torvalds
2006-07-02 20:44                       ` Linus Torvalds
2006-07-07  8:26 ` A note on merging conflicts Junio C Hamano

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=44A8339B.7070608@lsrfire.ath.cx \
    --to=rene.scharfe@lsrfire.ath.cx \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=torvalds@osdl.org \
    /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).