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

Re: How to sync two svn repositories via git?

From
JWJosef Wolf <jw@raven.inka.de>
Date
Apr 2, 2009, 10:36 UTC
Message-ID
<20090402103659.GB28619@raven.wolf.lan>
In-Reply-To
<49D46C2B.3080100@drmicha.warpmail.net>
On Thu, Apr 02, 2009 at 09:41:31AM +0200, Michael J Gruber wrote:
> Josef Wolf venit, vidit, dixit 02.04.2009 00:30:
[ ... ]
Show 13 quoted lines
> > The first step I'd like to do is to "mirror" the manual merges that were
> > done between the subversion repositories in the past:
> > 
> >     git checkout svn-first
> >     git merge -s ours --log commit-of-the-first-merge-in-svn-second
> > 
> >     git checkout svn-second
> >     git merge -s ours --log commit-of-the-first-merge-in-svn-first
> > 
> > This seems to work, but git-gui shows conflicts.  How can I get conflicts
> > when I use the "-s ours" merge strategy?
> 
> What do git status and git diff (--stat, --combined) say?
Umm, that's somewhat odd.

Directly after the merge commands, gitk says there are local modifications. Then I run "git status" which says the working directory is clean. Then I re-run gitk, which _now_ shows no local modifications any more.

Previous: Michael J Gruber
Message 3 of 3 in “How to sync two svn repositories via git?”
  1. Josef WolfApr 1, 2009
  2. Michael J GruberApr 2, 2009
  3. Josef WolfApr 2, 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.