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

Re: Git, merging, and News/Relnotes files

From
Edward Z. Yang <edwardzyang@thewritingpot.com>
Date
Jul 9, 2008, 01:14 UTC
Message-ID
<487410F4.1050808@thewritingpot.com>
In-Reply-To
<37fcd2780807060753h26d9391crff5f9ba5531db654@mail.gmail.com>
Dmitry Potapov wrote:
Show 7 quoted lines
> Having one file changed on almost every commit is not a good idea, and
> not only because it will cause unnecessary conflicts but also it may
> considerable increase the size of the whole repository. By default, the
> delta compression has limit 50, which means that every 50 change of file
> will become its full copy. If the changelog file is changed very often
> and it is long, it may turn out that changelog alone takes as much space
> as the rest of the source tree.

That is certainly a good technical point, and I will certainly look into building a log parser after we wrap up our next release cycle.

P.S. Linus, we ended up manually merging the NEWS file; in some cases there were branch specific changes in the file which would have been completely inappropriate with a union merge. Thank you for the suggestion, however.

Previous: Dmitry Potapov
Message 6 of 6 in “Git, merging, and News/Relnotes files”
  1. Edward Z. YangJul 5, 2008
  2. Linus TorvaldsJul 5, 2008
  3. Edward Z. YangJul 5, 2008
  4. Linus TorvaldsJul 5, 2008
  5. Dmitry PotapovJul 6, 2008
  6. Edward Z. YangJul 9, 2008

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.