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

Re: [msysGit] upload-pack timing issue on windows?

From
Johannes Sixt <j6t@kdbg.org>
Date
Aug 25, 2010, 20:53 UTC
Message-ID
<201008252253.04516.j6t@kdbg.org>
In-Reply-To
<AANLkTinboi+L3fvC___pULO0u_ZBNNOM6er+chxt7s07@mail.gmail.com>
On Mittwoch, 25. August 2010, Erik Faye-Lund wrote:
Show 6 quoted lines
> But I'm curious, what's the best way of import a couple of foreign
> source files, while maintaining a couple of patches on top of them?
> I'm thinking that perhaps a import-commit followed by the patches
> would make it easier to merge in changes than to just import the
> patched version, but I'm not entirely sure how to do such a merge
> without merging a full subtree...

This is about only two files. When a new version is available from upstream, just branch from the import-commit, apply the two new files, and merge the result.

-- Hannes
Previous: Erik Faye-LundNext: Erik Faye-Lund
Message 10 of 11 in “upload-pack timing issue on windows?”
  1. Erik Faye-LundFeb 5, 2010
  2. Johannes SixtFeb 6, 2010
  3. Erik Faye-LundFeb 6, 2010
  4. Johannes SixtFeb 6, 2010
  5. Erik Faye-LundFeb 8, 2010
  6. Jay SoffianFeb 10, 2010
  7. Erik Faye-LundAug 22, 2010
  8. Johannes SixtAug 24, 2010
  9. Erik Faye-LundAug 25, 2010
  10. Johannes SixtAug 25, 2010
  11. Erik Faye-LundAug 25, 2010

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.