git-svn vs. $Id$

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Tommi Virtanen
Date: Tuesday, May 16, 2006 - 10:33 am

Hi. I just ran into trouble with git-svn, related to a file
containing $Id$. Yes, I know $Id$ sucks and should be avoided,
and I'll be removing them shortly, but that doesn't change the
fact that the history contains files with them.

Just wanted to let you know of a workaround:
manually edit the relevant file in .git/git-svn/tree/ to
undo the $Id$ change, and git-svn fetch works again.

$ git-svn fetch
Tree mismatch, Got: c242bb60d78c1dfce133e0bbaca7f13895de00b2, Expected:
07d35ac911cc56aabea86f4467cafc1d92b724c4
 at /home/tv/bin/git-svn line 426
        main::assert_tree('a5890d459de08dc8adbbe34cdfb4b1f44f377ad8')
called at /home/tv/bin/git-svn line 392
        main::assert_svn_wc_clean(2039,
'a5890d459de08dc8adbbe34cdfb4b1f44f377ad8') called at
/home/tv/bin/git-svn line 262
        main::fetch() called at /home/tv/bin/git-svn line 105

$ git diff-tree -p 07d35ac911cc56aabea86f4467cafc1d92b724c4 \
  c242bb60d78c1dfce133e0bbaca7f13895de00b2
diff --git a/anonymized b/anonymized
index 16b3988..f43782a 100644
--- a/anonymized
+++ b/anonymized
@@ -1,4 +1,4 @@
-## $Id: anonymized 1775 2006-04-20 09:25:22Z tv $
+## $Id: anonymized 2025 2006-05-16 07:25:24Z tv $

 blah
 blah


So editing .git/git-svn/tree/anonymized and replacing
"1775 2006-04-20 09:25:22Z tv" with "2025 2006-05-16 07:25:24Z tv"
make git-svn happy again.

-- 
Inoi Oy, Tykist
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
git-svn vs. $Id$, Tommi Virtanen, (Tue May 16, 10:33 am)
Re: git-svn vs. $Id$, Linus Torvalds, (Tue May 16, 10:48 am)
Re: git-svn vs. $Id$, Tommi Virtanen, (Tue May 16, 11:12 am)
Re: git-svn vs. $Id$, Eric Wong, (Sat May 20, 6:12 pm)
[PATCH] git-svn: ignore expansion of svn:keywords, Eric Wong, (Sat May 20, 8:03 pm)
Re: git-svn vs. $Id$, Eric Wong, (Tue May 23, 7:23 pm)
[PATCH] git-svn: ignore expansion of svn:keywords, Eric Wong, (Tue May 23, 7:23 pm)