git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Wong <normalperson@yhbt.net>
To: Nicolas Vilz 'niv' <niv@iaglans.de>
Cc: git@vger.kernel.org
Subject: [PATCH] contrib/git-svn: tell the user to not modify git-svn-HEAD directly
Date: Mon, 27 Feb 2006 11:04:02 -0800	[thread overview]
Message-ID: <20060227190402.GA14199@localdomain> (raw)
In-Reply-To: <20060227184641.GA21684@hand.yhbt.net>

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

  parent reply	other threads:[~2006-02-27 19:04 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-27 17:59 git-svn and huge data and modifying the git-svn-HEAD branch directly Nicolas Vilz 'niv'
2006-02-27 18:46 ` Eric Wong
2006-02-27 18:55   ` Jan Harkes
2006-02-27 19:24     ` Eric Wong
2006-02-28  0:25       ` Martin Langhoff
2006-02-28  0:41         ` Linus Torvalds
2006-02-28  0:58           ` Martin Langhoff
2006-03-01  6:51           ` Eric Wong
2006-03-01  9:40             ` Andreas Ericsson
2006-03-01 15:53               ` Linus Torvalds
2006-03-01 16:07                 ` Andreas Ericsson
2006-03-01 16:24                   ` Linus Torvalds
2006-03-01 17:14                     ` Josef Weidendorfer
2006-03-01 17:28                       ` Shawn Pearce
2006-03-01 17:40                       ` Linus Torvalds
2006-03-01 18:06                         ` Josef Weidendorfer
2006-03-01 18:25                           ` Linus Torvalds
2006-03-01 20:26                             ` Josef Weidendorfer
2006-03-01 21:28                               ` Linus Torvalds
2006-03-01 19:11                         ` Junio C Hamano
2006-03-01 20:54                           ` Josef Weidendorfer
2006-03-01 21:40                           ` Martin Langhoff
2006-03-01 23:23                             ` Carl Worth
2006-03-01 23:43                               ` Linus Torvalds
2006-03-01 21:07                     ` Johannes Schindelin
2006-03-19 19:12               ` Petr Baudis
2006-03-19 19:35                 ` Linus Torvalds
2006-03-19 19:43                 ` Junio C Hamano
2006-02-27 19:04   ` Eric Wong [this message]
2006-02-27 19:34   ` Nicolas Vilz 'niv'
2006-02-27 20:27     ` Eric Wong
2006-02-27 20:47       ` Nicolas Vilz 'niv'
2006-02-27 20:55         ` [PATCH] contrib/git-svn: correct commit example in manpage Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060227190402.GA14199@localdomain \
    --to=normalperson@yhbt.net \
    --cc=git@vger.kernel.org \
    --cc=niv@iaglans.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).