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

Re: [RFC/PATCH] git-svn: add support for --first-parent

From
LHLars Hjemli <hjemli@gmail.com>
Date
Sep 6, 2007, 07:18 UTC
Message-ID
<8c5c35580709060018p50398071s32b271d52f4dc7e3@mail.gmail.com>
In-Reply-To
<20070905101929.GB11074@soma>
On 9/5/07, Eric Wong <normalperson@yhbt.net> wrote:
Show 10 quoted lines
> Lars Hjemli <hjemli@gmail.com> wrote:
> > When git-svn uses git-log to find embedded 'git-svn-id'-lines in commit
> > messages, it can get confused when local history contains merges with
> > other git-svn branches. But if --first-parent is supplied to git-log,
> > working_head_info() will only see 'branch-local' commits and thus the
> > first commit containing a 'git-svn-id' line should refer to the correct
> > subversion branch.
>
> Ideally, we'd probably stop, say something and give the user the choice
> of branches if multiple parents available.

Could you elaborate? (I don't understand how following the first parent of a merge could end up at the wrong svn branch)

-- larsh

Previous: Eric WongNext: Eric Wong
Message 3 of 22 in “git-svn: add support for --first-parent”
  1. git-svn: add support for --first-parentLars Hjemli, Sep 5, 2007
  2. Eric WongSep 5, 2007
  3. Lars HjemliSep 6, 2007
  4. Eric WongSep 6, 2007
  5. David KastrupSep 6, 2007
  6. Lars HjemliSep 6, 2007
  7. git-svn: remove --first-parent, add --upstreamLars Hjemli, Sep 6, 2007
  8. Steven GrimmSep 6, 2007
  9. Eric WongSep 6, 2007
  10. Eric WongSep 6, 2007
  11. Lars HjemliSep 6, 2007
  12. Peter BaumannSep 6, 2007
  13. Lars HjemliSep 7, 2007
  14. Peter BaumannSep 7, 2007
  15. Lars HjemliSep 7, 2007
  16. Peter BaumannSep 7, 2007
  17. Configure mutt to be used in git and lkml mailing lists (was: Re: [PATCH] git-svn: remove --first-parent, add --upstream)Fernando J. Pereda, Sep 7, 2007
  18. Eric WongSep 7, 2007
  19. Lars HjemliSep 15, 2007
  20. Peter BaumannSep 15, 2007
  21. Lars HjemliSep 15, 2007
  22. Peter BaumannSep 15, 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.