login
Header Space

 
 

[PATCH] contrib/git-svn: tell the user to not modify git-svn-HEAD directly

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Nicolas Vilz 'niv' <niv@...>
Cc: <git@...>
Date: Monday, February 27, 2006 - 3:04 pm

As a rule, interface branches to different SCMs should never be modified
directly by the user.  They are used exclusively for talking to the
foreign SCM.

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

---

 contrib/git-svn/git-svn.txt |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

4676a850ad5a9e4a88fa5dfba1ac231a58bffda1
diff --git a/contrib/git-svn/git-svn.txt b/contrib/git-svn/git-svn.txt
index b4b7789..b588a2a 100644
--- a/contrib/git-svn/git-svn.txt
+++ b/contrib/git-svn/git-svn.txt
@@ -43,6 +43,11 @@ fetch::
 	Fetch unfetched revisions from the SVN_URL we are tracking.
 	refs/heads/git-svn-HEAD will be updated to the latest revision.
 
+	Note: You should never attempt to modify the git-svn-HEAD branch
+	outside of git-svn.  Instead, create a branch from git-svn-HEAD
+	and work on that branch.  Use the 'commit' command (see below)
+	to write git commits back to git-svn-HEAD.
+
 commit::
 	Commit specified commit or tree objects to SVN.  This relies on
 	your imported fetch data being up-to-date.  This makes
@@ -179,7 +184,9 @@ SVN repositories via one git repository.
 environment variable to a name other other than "git-svn" (the default)
 and git-svn will ignore the contents of the $GIT_DIR/git-svn directory
 and instead do all of its work in $GIT_DIR/$GIT_SVN_ID for that
-invocation.
+invocation.  The interface branch will be $GIT_SVN_ID-HEAD, instead of
+git-svn-HEAD.  Any $GIT_SVN_ID-HEAD branch should never be modified
+by the user outside of git-svn commands.
 
 ADDITIONAL FETCH ARGUMENTS
 --------------------------
-- 
1.2.3.gfc24dc-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
git-svn and huge data and modifying the git-svn-HEAD branch ..., Nicolas Vilz 'niv', (Mon Feb 27, 1:59 pm)
Re: git-svn and huge data and modifying the git-svn-HEAD bra..., Nicolas Vilz 'niv', (Mon Feb 27, 3:34 pm)
Re: git-svn and huge data and modifying the git-svn-HEAD bra..., Nicolas Vilz 'niv', (Mon Feb 27, 4:47 pm)
[PATCH] contrib/git-svn: tell the user to not modify git-svn..., Eric Wong, (Mon Feb 27, 3:04 pm)
Re: git-svn and huge data and modifying the git-svn-HEAD bra..., Johannes Schindelin, (Wed Mar 1, 5:07 pm)
Re: git-svn and huge data and modifying the git-svn-HEAD bra..., Josef Weidendorfer, (Wed Mar 1, 1:14 pm)
Re: git-svn and huge data and modifying the git-svn-HEAD bra..., Josef Weidendorfer, (Wed Mar 1, 4:54 pm)
Re: git-svn and huge data and modifying the git-svn-HEAD bra..., Josef Weidendorfer, (Wed Mar 1, 2:06 pm)
Re: git-svn and huge data and modifying the git-svn-HEAD bra..., Josef Weidendorfer, (Wed Mar 1, 4:26 pm)
speck-geostationary