From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 15 Mar 2008 04:51:51 GMT
Subject: Re: [PATCH] git-new-workdir: Share SVN meta data between work dirs and the repository
Message-ID: <20080315045151.GC3107@hand.yhbt.net>
In-Reply-To: <87ejaczoxu.fsf@gollum.intra.norang.ca>

Bernt Hansen <bernt@norang.ca> wrote:
> Multiple work dirs with git svn caused each work dir to have its own
> stale copy of the SVN meta data in .git/svn
> 
> git svn rebase updates commits with git-svn-id: in the repository and
> stores the SVN meta data information only in that work dir.  Attempting to
> git svn rebase in other work dirs for the same branch would fail because
> the last revision fetched according to the git-svn-id is greater than the
> revision in the SVN meta data for that work directory.
> 
> Signed-off-by: Bernt Hansen <bernt@norang.ca>

Thanks, I've been meaning to add this myself

Acked-by: Eric Wong <normalperson@yhbt.net>

> ---
>  contrib/workdir/git-new-workdir |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/contrib/workdir/git-new-workdir b/contrib/workdir/git-new-workdir
> index 2838546..7959eab 100755
> --- a/contrib/workdir/git-new-workdir
> +++ b/contrib/workdir/git-new-workdir
> @@ -63,7 +63,7 @@ mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
>  # create the links to the original repo.  explictly exclude index, HEAD and
>  # logs/HEAD from the list since they are purely related to the current working
>  # directory, and should not be shared.
> -for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache
> +for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn
>  do
>  	case $x in
>  	*/*)
> -- 
> 1.5.4.4.537.gb75aa