threads / patch / 12702

patchgit-new-workdir: Share SVN meta data between work dirs and the repository

Subject: [PATCH] git-new-workdir: Share SVN meta data between work dirs and the repository

## tl;dr

2 messages between Mar 15, 2008 and Mar 15, 2008. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Bernt Hansen· Mar 15, 2008, 02:44 UTC · lore

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>
---
 contrib/workdir/git-new-workdir |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to contrib/workdir/git-new-workdir +1 −1
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
Eric Wong· Mar 15, 2008, 04:51 UTC · re: Bernt Hansen · lore

Re: [PATCH] git-new-workdir: Share SVN meta data between work dirs and the repository

Bernt Hansen <bernt@norang.ca> wrote:
Show 10 quoted lines
> 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>
Show 19 quoted lines
> ---
>  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

← back to recent threads