@@ -764,10 +764,9 @@ use `git svn rebase` to update your work branch instead of `git pull` or
764764when committing into SVN, which can lead to merge commits reversing
765765previous commits in SVN.
766766
767- DESIGN PHILOSOPHY
768- -----------------
769- Merge tracking in Subversion is lacking and doing branched development
770- with Subversion can be cumbersome as a result. While 'git svn' can track
767+ MERGE TRACKING
768+ --------------
769+ While 'git svn' can track
771770copy history (including branches and tags) for repositories adopting a
772771standard layout, it cannot yet represent merge history that happened
773772inside git back upstream to SVN users. Therefore it is advised that
@@ -777,16 +776,15 @@ compatibility with SVN (see the CAVEATS section below).
777776CAVEATS
778777-------
779778
780- For the sake of simplicity and interoperating with a less-capable system
781- (SVN), it is recommended that all 'git svn' users clone, fetch and dcommit
779+ For the sake of simplicity and interoperating with Subversion,
780+ it is recommended that all 'git svn' users clone, fetch and dcommit
782781directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push'
783782operations between git repositories and branches. The recommended
784783method of exchanging code between git branches and users is
785784'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository.
786785
787786Running 'git merge' or 'git pull' is NOT recommended on a branch you
788- plan to 'dcommit' from. Subversion does not represent merges in any
789- reasonable or useful fashion; so users using Subversion cannot see any
787+ plan to 'dcommit' from because Subversion users cannot see any
790788merges you've made. Furthermore, if you merge or pull from a git branch
791789that is a mirror of an SVN branch, 'dcommit' may commit to the wrong
792790branch.
@@ -836,7 +834,7 @@ Renamed and copied directories are not detected by git and hence not
836834tracked when committing to SVN. I do not plan on adding support for
837835this as it's quite difficult and time-consuming to get working for all
838836the possible corner cases (git doesn't do it, either). Committing
839- renamed and copied files are fully supported if they're similar enough
837+ renamed and copied files is fully supported if they're similar enough
840838for git to detect them.
841839
842840CONFIGURATION
0 commit comments