summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 621ff67)
raw | patch | inline | side by side (parent: 621ff67)
author | Bernt Hansen <bernt@norang.ca> | |
Sat, 15 Mar 2008 02:44:13 +0000 (22:44 -0400) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 15 Mar 2008 07:05:18 +0000 (00:05 -0700) |
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>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/workdir/git-new-workdir | patch | blob | history |
index 2838546d16073f29b3a87ce9126d92b0f640be5e..7959eab902d28bb3307c542514ca4c5f49deee0f 100755 (executable)
# 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
*/*)