From: Stefan Sperling <stsp@stsp.name>
To: git@vger.kernel.org
Cc: Stefan Sperling <stsp@stsp.name>
Subject: [PATCH] remove noise and inaccuracies from git-svn docs
Date: Tue, 19 Apr 2011 11:06:46 +0200 [thread overview]
Message-ID: <1303204006-24191-1-git-send-email-stsp@stsp.name> (raw)
In-Reply-To: <7v39lfa1h5.fsf@alter.siamese.dyndns.org>
Signed-off-by: Stefan Sperling <stsp@stsp.name>
---
Documentation/git-svn.txt | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 4aa6404..fedf310 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -767,10 +767,9 @@ use `git svn rebase` to update your work branch instead of `git pull` or
when committing into SVN, which can lead to merge commits reversing
previous commits in SVN.
-DESIGN PHILOSOPHY
------------------
-Merge tracking in Subversion is lacking and doing branched development
-with Subversion can be cumbersome as a result. While 'git svn' can track
+MERGE TRACKING
+--------------
+While 'git svn' can track
copy history (including branches and tags) for repositories adopting a
standard layout, it cannot yet represent merge history that happened
inside git back upstream to SVN users. Therefore it is advised that
@@ -780,16 +779,15 @@ compatibility with SVN (see the CAVEATS section below).
CAVEATS
-------
-For the sake of simplicity and interoperating with a less-capable system
-(SVN), it is recommended that all 'git svn' users clone, fetch and dcommit
+For the sake of simplicity and interoperating with Subversion,
+it is recommended that all 'git svn' users clone, fetch and dcommit
directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push'
operations between git repositories and branches. The recommended
method of exchanging code between git branches and users is
'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository.
Running 'git merge' or 'git pull' is NOT recommended on a branch you
-plan to 'dcommit' from. Subversion does not represent merges in any
-reasonable or useful fashion; so users using Subversion cannot see any
+plan to 'dcommit' from because Subversion users cannot see any
merges you've made. Furthermore, if you merge or pull from a git branch
that is a mirror of an SVN branch, 'dcommit' may commit to the wrong
branch.
@@ -839,7 +837,7 @@ Renamed and copied directories are not detected by git and hence not
tracked when committing to SVN. I do not plan on adding support for
this as it's quite difficult and time-consuming to get working for all
the possible corner cases (git doesn't do it, either). Committing
-renamed and copied files are fully supported if they're similar enough
+renamed and copied files is fully supported if they're similar enough
for git to detect them.
CONFIGURATION
--
1.7.3.5
next prev parent reply other threads:[~2011-04-19 9:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-18 14:46 [PATCH] remove noise and inaccuracies from git-svn docs Stefan Sperling
2011-04-18 16:26 ` Matthieu Moy
2011-04-18 17:55 ` Junio C Hamano
2011-04-19 9:06 ` Stefan Sperling [this message]
2011-04-19 9:31 ` Stefan Sperling
2011-04-19 11:19 ` Michael J Gruber
2011-04-19 12:00 ` Stefan Sperling
2011-04-19 12:24 ` Michael J Gruber
2011-04-19 15:59 ` Piotr Krukowiecki
2011-05-05 19:13 ` git-svn and a new svn remote helper Matthew L Daniel
2011-05-05 20:25 ` Sverre Rabbelier
2011-05-05 20:32 ` Matthew Daniel
2011-05-05 20:33 ` Sverre Rabbelier
2011-04-28 17:34 ` [PATCH] remove noise and inaccuracies from git-svn docs Stefan Sperling
2011-04-28 17:57 ` Michael Schubert
2011-04-29 10:39 ` Stefan Sperling
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=1303204006-24191-1-git-send-email-stsp@stsp.name \
--to=stsp@stsp.name \
--cc=git@vger.kernel.org \
/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).