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

Re: [PATCH 1/3] t9151: Fix a few commits in the SVN dump

From
Sam Vilain <sam@vilain.net>
Date
Feb 24, 2010, 23:14 UTC
Message-ID
<4B85B2CC.3090509@vilain.net>
In-Reply-To
<1266825442-32107-2-git-send-email-tuomas.suutari@gmail.com>
Tuomas Suutari wrote:
Show 9 quoted lines
> A few "svn cp" commands and commit commands were executed in incorrect
> order. Therefore some of the desired commits were missing and some
> were committed with wrong revision number in the commit message. This
> made it hard to compare the produced git repository with the SVN
> repository.
>
> The dump file is updated too, but only the relevant parts and with
> hand-edited timestamps to make history linear.
>   
Show 16 quoted lines
>  say "Make PARTIAL branch"
>  svn update
> -i=$(commit $i "make partial branch")
>  svn cp trunk/subdir branches/partial
> +i=$(commit $i "make partial branch")
>  
>  say "Make a commit to PARTIAL"
>  svn update
> @@ -194,13 +194,13 @@ cd ../../
>  
>  say "Tagging trunk"
>  svn update
> -i=$(commit $i "tagging v1.0")
>  svn cp trunk tags/v1.0
> +i=$(commit $i "tagging v1.0")
>   
Whoops.  Yes, that looks eminently sensible, probably my fault :-).
Acked-by: Sam Vilain <sam@vilain.net>
Sam
Previous: Tuomas SuutariNext: Tuomas Suutari
Message 3 of 10 in “git-svn detects some merges incorrectly from svn:mergeinfo”
  1. Tuomas SuutariFeb 22, 2010
  2. 1/3 t9151: Fix a few commits in the SVN dumpTuomas Suutari, Feb 22, 2010
  3. Sam VilainFeb 24, 2010
  4. 2/3 t9151: Add two new svn:mergeinfo test casesTuomas Suutari, Feb 22, 2010
  5. 3/3 git-svn: Fix discarding of extra parents from svn:mergeinfoTuomas Suutari, Feb 22, 2010
  6. Thomas RastFeb 22, 2010
  7. Tuomas SuutariFeb 22, 2010
  8. 3/3 git-svn: Fix discarding of extra parents from svn:mergeinfoTuomas Suutari, Feb 22, 2010
  9. Thomas RastFeb 23, 2010
  10. Eric WongFeb 26, 2010

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.