All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sam Vilain <sam@vilain.net>
To: Tuomas Suutari <tuomas.suutari@gmail.com>
Cc: git@vger.kernel.org, Eric Wong <normalperson@yhbt.net>
Subject: Re: [PATCH 1/3] t9151: Fix a few commits in the SVN dump
Date: Thu, 25 Feb 2010 12:14:20 +1300	[thread overview]
Message-ID: <4B85B2CC.3090509@vilain.net> (raw)
In-Reply-To: <1266825442-32107-2-git-send-email-tuomas.suutari@gmail.com>

Tuomas Suutari wrote:
> 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.
>   

>  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

  reply	other threads:[~2010-02-24 23:23 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-22  7:57 git-svn detects some merges incorrectly from svn:mergeinfo Tuomas Suutari
2010-02-22  7:57 ` [PATCH 1/3] t9151: Fix a few commits in the SVN dump Tuomas Suutari
2010-02-24 23:14   ` Sam Vilain [this message]
2010-02-22  7:57 ` [PATCH 2/3] t9151: Add two new svn:mergeinfo test cases Tuomas Suutari
2010-02-22  7:57 ` [PATCH 3/3] git-svn: Fix discarding of extra parents from svn:mergeinfo Tuomas Suutari
2010-02-22  9:57   ` Thomas Rast
2010-02-22 18:04     ` Tuomas Suutari
2010-02-22 18:12   ` [PATCH 3/3 v2] " Tuomas Suutari
2010-02-23 16:58     ` Thomas Rast
2010-02-26  9:50 ` git-svn detects some merges incorrectly " Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4B85B2CC.3090509@vilain.net \
    --to=sam@vilain.net \
    --cc=git@vger.kernel.org \
    --cc=normalperson@yhbt.net \
    --cc=tuomas.suutari@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.