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

Re: question re dcommit problem

From
Thomas Rast <trast@student.ethz.ch>
Date
Jan 30, 2009, 21:43 UTC
Message-ID
<200901302243.57996.trast@student.ethz.ch>
In-Reply-To
<20090130084253.GA30046@denkbrett.schottelius.org>
Nico -telmich- Schottelius wrote:
Show 7 quoted lines
> David Mann [Thu, Jan 29, 2009 at 07:14:08PM -0500]:
> > I created a git repository from my svn repository, later uploaded it to
> > GitHub, and after some branching and merging, can no longer dcommit back
> > to the svn repository. [...]
> 
> Iirc git svn does not support merges. You've to use git rebase or
> update through the svn server.

It does support them on the git side. To SVN, the merge should look like the squashed result (along the first-parent line). On your local git end, it should rebase the merge (to allow for git-svn-id) but preserve parents, thus keeping history.

However, it is very important that the SVN line of history is always reachable along the first-parent line. David, did you ensure that?

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
Previous: Nico -telmich- Schottelius
Message 3 of 3 in “question re dcommit problem”
  1. David MannJan 30, 2009
  2. Nico -telmich- SchotteliusJan 30, 2009
  3. Thomas RastJan 30, 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.