From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [RFC] [PATCH 0/5] Implement 'prior' commit object links (and other commit links ideas)
Date: Sat, 29 Apr 2006 16:59:12 +0200 [thread overview]
Message-ID: <e2vuuj$nhp$1@sea.gmane.org> (raw)
In-Reply-To: e2kset$lk2$1@sea.gmane.org
Jakub Narebski wrote:
> Junio C Hamano wrote:
>
>> Jakub Narebski <jnareb@gmail.com> writes:
>>
>>> Actually, this can be resolved using automatic history grafts to the
>>> remote repository we pulled from, if the commit is not present on local
>>> side (and removing graft when commit appears on local side).
>>
>> You do not even need history grafts. The "cherry-pick source"
>> was a bad example. Maybe using "related" as a way to implement
>> "bind" would have been a better example -- we want inter-commit
>> relationship that requires connectivity but without ancestry for
>> them.
>>
>> You can just have two kinds of 'related'. One that means
>> connectivity, the other that does not.
>
> Good idea.
>
> Another problem for core git, but I think orthogonal to the
> "related"/"note" distinction is if the relation (or note) should be used
> as helper in merges, perhaps by some agreed upon convention on the
> comment/description/value part (e.g. "mergehelper" or "mergeinfo").
Scratch that. It would be better for merge strategy just to check for
defined set of "links" and "notes", e.g. "prior" (pu-prior) and
"original" (cherrypick).
But there would be problem with connectivity provided by "link" relations,
namely info/grafts file, which deal only with parents. For example when we
cauterize history using grafts (e.g. for shallow clone) the "link" like
"prior" reaching to the cut-off part of the history might make your day ;-)
Well, we could always drop all the connectivity, and make
link sha1 description...
shortcut for
note link sha1 description...
--
Jakub Narebski
Warsaw, Poland
next prev parent reply other threads:[~2006-04-29 14:58 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-25 3:54 [RFC] [PATCH 0/5] Implement 'prior' commit object links Sam Vilain
2006-04-25 4:31 ` [PATCH 1/5] add 'prior' link in commit structure Sam Vilain
2006-04-25 5:18 ` Junio C Hamano
2006-04-25 4:31 ` [PATCH 2/5] git-merge-base: follow 'prior' links to find merge bases Sam Vilain
2006-04-25 5:19 ` Junio C Hamano
2006-04-25 4:31 ` [PATCH 3/5] commit.c: parse 'prior' link Sam Vilain
2006-04-25 4:31 ` [PATCH 5/5] git-commit: add --prior to set prior link Sam Vilain
2006-04-25 4:31 ` [PATCH 4/5] git-commit-tree: add support for prior Sam Vilain
2006-04-25 4:34 ` [RFC] [PATCH 0/5] Implement 'prior' commit object links Sam Vilain
2006-04-25 5:16 ` Junio C Hamano
2006-04-25 23:19 ` Sam Vilain
2006-04-26 5:06 ` Jakub Narebski
2006-04-26 5:22 ` Jakub Narebski
2006-04-26 5:36 ` [OT] " Junio C Hamano
2006-04-26 6:35 ` Jakub Narebski
2006-04-26 6:50 ` Junio C Hamano
2006-04-26 7:22 ` Jakub Narebski
2006-04-26 7:50 ` Junio C Hamano
2006-04-26 8:44 ` Jakub Narebski
2006-04-26 9:21 ` Junio C Hamano
2006-04-26 9:28 ` Jakub Narebski
2006-04-26 6:51 ` Sam Vilain
2006-04-25 6:44 ` [RFC] [PATCH 0/5] Implement 'prior' commit object links (and other commit links ideas) Jakub Narebski
2006-04-25 7:29 ` Junio C Hamano
2006-04-25 7:43 ` Jakub Narebski
[not found] ` <20060425043436.2ff53318.seanlkml@sympatico.ca>
2006-04-25 8:34 ` sean
[not found] ` <20060425045752.0c6fbc21.seanlkml@sympatico.ca>
2006-04-25 8:57 ` sean
2006-04-25 9:10 ` Jakub Narebski
2006-04-25 9:58 ` Junio C Hamano
2006-04-25 10:08 ` Jakub Narebski
2006-04-29 14:59 ` Jakub Narebski [this message]
2006-04-25 15:21 ` Linus Torvalds
2006-04-25 15:40 ` Linus Torvalds
[not found] ` <20060425121700.2d1a0032.seanlkml@sympatico.ca>
2006-04-25 16:17 ` sean
2006-04-25 17:04 ` Linus Torvalds
2006-04-26 11:25 ` Andreas Ericsson
2006-04-26 12:01 ` Jakub Narebski
2006-04-25 16:27 ` Jakub Narebski
2006-04-25 17:11 ` Linus Torvalds
2006-04-25 17:36 ` Jakub Narebski
2006-04-25 17:57 ` Linus Torvalds
2006-04-25 18:06 ` Linus Torvalds
2006-04-25 18:24 ` Jakub Narebski
[not found] ` <20060425135250.5fd889f4.seanlkml@sympatico.ca>
2006-04-25 17:52 ` sean
2006-04-25 18:08 ` Linus Torvalds
[not found] ` <20060425141412.5c115f51.seanlkml@sympatico.ca>
2006-04-25 18:14 ` sean
2006-04-25 18:26 ` Linus Torvalds
2006-04-25 18:41 ` Jakub Narebski
2006-04-25 18:52 ` Linus Torvalds
2006-04-25 19:00 ` Jakub Narebski
2006-04-25 22:17 ` Jason Riedy
[not found] ` <20060425144525.3ef957cf.seanlkml@sympatico.ca>
2006-04-25 18:45 ` sean
2006-04-25 19:00 ` Linus Torvalds
2006-04-25 19:18 ` Junio C Hamano
2006-04-25 19:34 ` Linus Torvalds
2006-04-25 19:51 ` Junio C Hamano
2006-04-25 19:58 ` Linus Torvalds
2006-04-26 12:42 ` Jakub Narebski
2006-04-25 19:00 ` Junio C Hamano
2006-04-25 19:09 ` Linus Torvalds
2006-04-25 18:34 ` Jakub Narebski
2006-04-25 23:18 ` Sam Vilain
2006-04-25 15:10 ` [RFC] [PATCH 0/5] Implement 'prior' commit object links Linus Torvalds
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='e2vuuj$nhp$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.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).