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

Re: [PATCH v3] git-svn: Make following parents atomic

From
EWEric Wong <normalperson@yhbt.net>
Date
Dec 8, 2008, 23:35 UTC
Message-ID
<20081208233523.GB21675@hand.yhbt.net>
In-Reply-To
<20081208133131.GA9190@euler>
Deskin Miller <deskinm@umich.edu> wrote:
Show 20 quoted lines
> find_parent_branch generates branch@rev type branches when one has to
> look back through SVN history to properly get the history for a branch
> copied from somewhere not already being tracked by git-svn.  If in the
> process of fetching this history, git-svn is interrupted, then when one
> fetches again, it will use whatever was last fetched as the parent
> commit and fail to fetch any more history which it didn't get to before
> being terminated.  This is especially troubling in that different
> git-svn copies of the same SVN repository can end up with different
> commit sha1s, incorrectly showing the history as divergent and
> precluding easy collaboration using git push and fetch.
> 
> To fix this, when we initialise the Git::SVN object $gs to search for
> and perhaps fetch history, we check if there are any commits in SVN in
> the range between the current revision $gs is at, and the top revision
> for which we were asked to fill history.  If there are commits we're
> missing in that range, we continue the fetch from the current revision
> to the top, properly getting all history before using it as the parent
> for the branch we're trying to create.
> 
> Signed-off-by: Deskin Miller <deskinm@umich.edu>
Looks good Deskin, thanks
Acked-by: Eric Wong <normalperson@yhbt.net>
Previous: Deskin MillerNext: Thomas Jarosch
Message 7 of 9 in “git-svn: Make following parents atomic”
  1. git-svn: Make following parents atomicDeskin Miller, Dec 7, 2008
  2. [ANNOUNCE] git-svn-bugfix script (Re: [PATCH] git-svn: Make following parents atomic)Deskin Miller, Dec 7, 2008
  3. Deskin MillerDec 7, 2008
  4. git-svn: Make following parents atomicDeskin Miller, Dec 8, 2008
  5. Junio C HamanoDec 8, 2008
  6. git-svn: Make following parents atomicDeskin Miller, Dec 8, 2008
  7. Eric WongDec 8, 2008
  8. Thomas JaroschDec 16, 2008
  9. Thomas JaroschDec 22, 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.