git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Holger Hellmuth (IKS)" <hellmuth@ira.uka.de>
To: Andreas Krey <a.krey@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: first parent, commit graph layout, and pull merge direction
Date: Fri, 24 May 2013 11:29:00 +0200	[thread overview]
Message-ID: <519F32DC.0@ira.uka.de> (raw)
In-Reply-To: <20130523192512.GR9448@inner.h.apk.li>

Am 23.05.2013 21:25, schrieb Andreas Krey:
> On Thu, 23 May 2013 11:06:57 +0000, Andreas Krey wrote:
> ...
>> ...
>>> Don't do that, then.
>
> Ouch, you're right. The problem is not actually in the
> pull; only the *last* pull into a feature branch that
> then get pushed back ff to master needs to be reversed.
>
> And at that time you don't know it's the last one
> -> swap parents before the push if necessary.

if you have to be so careful to ensure the correct ordering of parents 
it almost defeats the initial objective to make commit graphs in gitk 
look nice without re-educating/restricting other users. A solution that 
works for everyone should work without users having to think about it.

Here is an idea (probably already discussed in the long history of git):
1) the branch name is recorded in a commit (for merges the branch that 
is updated)
2) unique identifier of repository is recorded in commit (optional)
3) simple configurable ordering and/or coloring scheme in gitk based on 
committer,branch name and repo (with wildcards).

With this users could pull and push as often as they like, the main 
branches would always be ordered and straight lines. If instead you 
already do the work to keep your history clean you could just use the 
coloring scheme and see committers color coded in gitk. Further benefit: 
the history of really old commits could be more easily remembered if you 
knew in what branch they originated

Is this a bad idea or just no one did it yet?

  reply	other threads:[~2013-05-24  9:28 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-22 11:50 first parent, commit graph layout, and pull merge direction Andreas Krey
2013-05-22 18:07 ` Junio C Hamano
2013-05-23  9:06   ` Andreas Krey
2013-05-23  9:48     ` John Szakmeister
2013-05-23 10:07       ` Jeremy Rosen
2013-05-23 10:29       ` Andreas Krey
2013-05-23 11:08         ` John Keeping
2013-05-23 16:01           ` Junio C Hamano
2013-05-23 16:41             ` John Keeping
2013-05-23 21:01               ` Junio C Hamano
2013-05-23 21:55                 ` John Keeping
2013-05-23 21:59                   ` Felipe Contreras
2013-05-23 22:11                   ` Junio C Hamano
2013-05-23 22:46                     ` Felipe Contreras
2013-05-23 22:54                       ` Junio C Hamano
2013-05-23 23:09                         ` Felipe Contreras
2013-05-23 23:26                           ` Junio C Hamano
2013-05-23 23:53                             ` Felipe Contreras
2013-05-24  8:29                               ` John Keeping
2013-05-24  9:38                                 ` John Szakmeister
2013-05-24  0:03                     ` Linus Torvalds
2013-05-24  0:21                       ` Junio C Hamano
2013-05-24  0:24                         ` Linus Torvalds
2013-05-24  0:25                         ` Felipe Contreras
2013-05-24  0:32                           ` Felipe Contreras
2013-05-24 16:26                             ` Junio C Hamano
2013-05-24 20:47                               ` Philip Oakley
2013-06-27 19:48                       ` [PATCH] pull: require choice between rebase/merge on non-fast-forward pull Junio C Hamano
2013-06-27 20:10                         ` W. Trevor King
2013-06-27 21:20                           ` Junio C Hamano
2013-06-28  1:08                             ` W. Trevor King
2013-06-28  6:34                           ` Matthieu Moy
2013-06-28  9:09                             ` W. Trevor King
2013-06-28 11:52                               ` Matthieu Moy
2013-06-28 12:28                                 ` W. Trevor King
2013-06-27 20:11                         ` Fredrik Gustafsson
2013-06-27 20:49                           ` Junio C Hamano
2013-06-27 20:30                         ` W. Trevor King
2013-06-27 20:58                           ` Junio C Hamano
2013-06-27 22:16                         ` Matthieu Moy
2013-06-28  1:19                           ` W. Trevor King
2013-06-28  8:09                         ` John Keeping
2013-06-28 17:22                           ` Junio C Hamano
2013-06-28 17:42                             ` John Keeping
2013-06-28 22:41                               ` Junio C Hamano
2013-07-02 21:18                                 ` John Keeping
2013-07-14 15:03                                 ` [PATCH] fixup! " John Keeping
2013-07-15  4:23                                   ` Junio C Hamano
2013-08-28 23:22                                 ` [PATCH] " Felipe Contreras
2013-07-18 14:30                         ` John Keeping
2013-07-18 17:38                           ` Andreas Schwab
2013-07-18 18:00                             ` Junio C Hamano
2013-07-18 19:35                               ` [PATCH v2] " Junio C Hamano
2013-07-19  0:54                                 ` Eric Sunshine
2013-07-19 16:22                                   ` Junio C Hamano
2013-07-19 20:29                                     ` Eric Sunshine
2013-07-19 22:20                                       ` Junio C Hamano
2013-07-19 22:30                                         ` Eric Sunshine
2013-07-19 22:55                                           ` Junio C Hamano
2014-01-22 19:08                                 ` Flimm
2013-05-24 17:11             ` first parent, commit graph layout, and pull merge direction Andreas Krey
2013-05-24 19:23               ` Junio C Hamano
2013-05-23 19:25     ` Andreas Krey
2013-05-24  9:29       ` Holger Hellmuth (IKS) [this message]
2013-05-24 13:42         ` Andreas Krey
2013-05-24 15:05           ` Holger Hellmuth (IKS)
2013-05-24 17:24             ` Andreas Krey
2013-05-23 11:34 ` Felipe Contreras
2013-05-23 12:21   ` Andreas Krey

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=519F32DC.0@ira.uka.de \
    --to=hellmuth@ira.uka.de \
    --cc=a.krey@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).