summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir@cohens.org.il>2009-04-25 13:12:02 +0300
committerTzafrir Cohen <tzafrir@cohens.org.il>2009-04-25 13:12:02 +0300
commite3a837b74ea9dab5b2f3bffcbee04261472e6fcc (patch)
tree23f86bca98bf65d8fc02cf5562e53b864842dd70
parent57baf538b547edf739d6ecb62ef473c0ca6e0a54 (diff)
Add the missing Pros and Cons section
-rw-r--r--git-asterisk-howto46
1 files changed, 46 insertions, 0 deletions
diff --git a/git-asterisk-howto b/git-asterisk-howto
index 3d34a8c..6fba7c5 100644
--- a/git-asterisk-howto
+++ b/git-asterisk-howto
@@ -128,3 +128,49 @@ Some useful commands:
For more information, see the man page gittutorial as well as
http://git-scm.com/documentation
+
+Pros and Cons
+-------------
+===The good:
+Working off-line::
+ If you want to be able to use 'svn log' and 'svn diff' to a different
+ branch, now you can.
+
+Efficient repository browser::
+ With git you can effectively browse commit logs and working copies of
+ various branches. In fact, using it merely as a logs and versions
+ browser can be useful on its own.
+
+Branches really work::
+ With SVN merging a branch is complicated. Partially because lack of
+ separate merge tracking.With git you don't need the extra svnmerge:
+ changes that don't collide with your branch merge in a quick merge
+ operation.
+
+===Limitations:
+svn:externals ::
+ does not really work well with git-svn (and similar systems: svk,
+ bzr-svn and hg-svn). Git has something called submodules that allows
+ emulating the basic functionality of svn:externals, but is not as
+ transparent.
+
+Commiting::
+ Not sure how safe it is to commit from such a copy. In most places I
+ see that it is not recommended to commit directly from git-svn. OTOH,
+ git has some tools that make it easy to prepare a patch set out of a
+ branch (e.g. git format-patch).
+
+ IIRC there are also some issues for git-svn with https certificate
+ authentication in the first place.
+
+Tags::
+ /tags are branches. SVN tags are really branches that we pretend not
+ to change. And in fact in Asterisk we practically do change. But see
+ workaround below to generate tags from the tag branches.
+
+/team branches::
+ At least with git 1.5.x you can't easily follow all the team branches.
+ This is due to a bug in their handling of wildcards in branches
+ description. I believe this has been resolved in 1.6 but I didn't get
+ to test that. Even if it will, it will require an extra step of manual
+ editing.