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

Re: blame follows renames, but log doesn't

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 19, 2007, 08:39 UTC
Message-ID
<7vtzt4wd68.fsf@assigned-by-dhcp.pobox.com>
In-Reply-To
<20070619071916.GC9177@thunk.org>
Theodore Tso <tytso@mit.edu> writes:
Show 10 quoted lines
> Actually, the bigger missing gap is merges.  Suppose in the
> development branch, you rename a whole bunch of files.  (For example,
> foo_super.c got moved to foo/super.c, foo_inode.c got moved to
> foo/inode.c, etc.)
>
> Now suppose there are fixes made in the stable branch, in the original
> foo_super.c and foo_inode.c files.  Ideally you would want to be able
> to pull those changes into the development branch, where the files
> have new names, and have the changes be applied to foo/super.c and
> foo/inode.c in the development branch.

That happens already with merge-recursive code, which has been the default since late November 2005 (v0.99.9k and later should have it).

What does _not_ happen is if foo_fixes.c was _created_ in the stable branch. A merge that tries to forward port such a fix would not move the foo_fixes.c to foo/fixes.c.

Previous: Martin LanghoffNext: Steven Grimm
Message 5 of 10 in “blame follows renames, but log doesn't”
  1. Martin LanghoffJun 19, 2007
  2. Sam VilainJun 19, 2007
  3. Theodore TsoJun 19, 2007
  4. Martin LanghoffJun 19, 2007
  5. Junio C HamanoJun 19, 2007
  6. Steven GrimmJun 19, 2007
  7. Directory renames (was Re: blame follows renames, but log doesn't)Steven Grimm, Jun 19, 2007
  8. Sam VilainJun 20, 2007
  9. Steven GrimmJun 20, 2007
  10. Jakub NarebskiJun 20, 2007

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.