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

Merging in commits from a non-common ancestors

From
ABAlex Bennee <kernel-hacker@bennee.com>
Date
Nov 21, 2006, 15:28 UTC
Message-ID
<1164122884.28560.210.camel@okra.transitives.com>
Hi,

I've been experimenting with using git alongside our CVS to manage my own development. In an ideal world I would have a full git tree with all the baselines tagged in it so merging is painless. However for the time being I have written a script to import a cvs tag into a git tree (that ignores the CVS gubbins). However one of the things I want to achieve is the ability to easily move hacks/patches from one tree to another.

The problem is that these tree's don't have common ancestor's in the git tree as I haven't imported all our baselines. However the individual commits should apply, I'm just not sure how to tell git to apply the commits as patches rather than try and work out the full differences between the two trees. Of course I'd like git to keep the commit messages.

Am I missing something blindingly obvious?
-- 
Alex, homepage: http://www.bennee.com/~alex/
In seeking the unattainable, simplicity only gets in the way. --
Epigrams in Programming, ACM SIGPLAN Sept. 1982
Next: Jakub Narebski
Message 1 of 2 in “Merging in commits from a non-common ancestors”
  1. Alex BenneeNov 21, 2006
  2. Jakub NarebskiNov 21, 2006

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.