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

Re: merge smart enough to adapt to renames?

From
Kris Shannon <kris@shannon.id.au>
Date
Feb 21, 2009, 04:48 UTC
Message-ID
<e51f4f550902202048g9a210f0t8fefaee4d8376f6c@mail.gmail.com>
In-Reply-To
<499E5A9C.6090900@dawes.za.net>
Rogan Dawes wrote:
Show 6 quoted lines
> It seems to me that git is smart enough to figure out where contents get
> moved to, once. Of course, if you have conflicting moves in the same
> repo, git's automation falls down. So, if you need to move the "same"
> file in different repositories to different places, you need to do it
> via an intermediate repo that will be able to "remember" which movement
> you chose.
You don't need a whole different repo,  branches are good enough.

git checkout gentoo-integration git pull gentoo

git checkout sunrise-integration git pull sunrise

git checkout master git merge gentoo git merge sunrise

The integration branches can remember your local changes to the remotes (like the move of packages.mask)

Previous: Rogan DawesNext: Rogan Dawes
Message 7 of 10 in “merge smart enough to adapt to renames?”
  1. Caleb CushingFeb 19, 2009
  2. Sitaram ChamartyFeb 19, 2009
  3. Caleb CushingFeb 19, 2009
  4. Sitaram ChamartyFeb 20, 2009
  5. Caleb CushingFeb 20, 2009
  6. Rogan DawesFeb 20, 2009
  7. Kris ShannonFeb 21, 2009
  8. Rogan DawesFeb 21, 2009
  9. Caleb CushingFeb 22, 2009
  10. Rogan DawesFeb 22, 2009

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.