git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Joining cg-*-id

From
Petr Baudis <pasky@suse.cz>
Date
Sep 20, 2005, 13:57 UTC
Message-ID
<20050920135735.GC1884@pasky.or.cz>
In-Reply-To
<Pine.LNX.4.58.0509191746130.2553@g5.osdl.org>

Dear diary, on Tue, Sep 20, 2005 at 02:50:21AM CEST, I got a letter where Linus Torvalds <torvalds@osdl.org> told me that...

Show 17 quoted lines
> On Tue, 20 Sep 2005, Petr Baudis wrote:
> > But that semantics sucks, and I wouldn't mind changing it at all. I
> > think taking the previous commit works for everything but the start of
> > cg-log range, and it is how CVS behaves.
> 
> The thing is, it may have sensible behaviour for CVS, but only because CVS 
> doesn't have any notion of concurrent development (even a branch isn't 
> concurrent - it's totally separate, and when you merge it, it becomes just 
> one big diff at the time of the merge).
> 
> So I'd love to have
> 
> 	git diff yesterday..
> 
> but the fact is, there's no sensible semantics for it. _which_ yesterday? 
> There might be five different points that are "close to 24 hours ago", 
> along five different paths backwards in the history.

A well-defined meaning for this from Cogito standpoint would be "the last commit on our HEAD before the date and all commits committed and merged to the HEAD". In Cogito, you don't merge two branches _together_, you merge one branch _into_ another (represented by the parents order), so this would be sensible.

But we would have to sort the log in merge order for this to be possible (and probably teach git-rev-list about it anyway). I would absolutely *love* to have cg-log in merge order instead of date order - longer I see it the more I believe that it's evil and you should really want merge order instead. The trouble is that cg-log would be no longer incremental and would have to load the whole history first, a no-go for any measurably long history.

By the way, did I understand it right that the only difference between the results of merge ordering and topo ordering is the order commits with regard to the order of parents?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.
Previous: Linus TorvaldsNext: Linus Torvalds
Message 6 of 22 in “Joining cg-*-id”
  1. Pavel RoskinSep 19, 2005
  2. Petr BaudisSep 19, 2005
  3. Linus TorvaldsSep 19, 2005
  4. Petr BaudisSep 19, 2005
  5. Linus TorvaldsSep 20, 2005
  6. Petr BaudisSep 20, 2005
  7. Linus TorvaldsSep 20, 2005
  8. Petr BaudisSep 20, 2005
  9. Linus TorvaldsSep 20, 2005
  10. Linus TorvaldsSep 20, 2005
  11. Paul MackerrasSep 21, 2005
  12. Linus TorvaldsSep 21, 2005
  13. Paul MackerrasSep 21, 2005
  14. Petr BaudisSep 21, 2005
  15. Matthias UrlichsSep 20, 2005
  16. Junio C HamanoSep 20, 2005
  17. Matthias UrlichsSep 20, 2005
  18. Paul MackerrasSep 20, 2005
  19. Pavel RoskinSep 19, 2005
  20. Petr BaudisSep 19, 2005
  21. Pavel RoskinSep 20, 2005
  22. Petr BaudisSep 20, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.