Changes between Version 38 and Version 39 of DarcsEvaluation

Timestamp:

07/24/08 07:57:16 (5 years ago)

Author:

simonmar

Comment:

rearrange

DarcsEvaluation

@@ -362 +362 @@
 
 
+
+
+== Darcs alternatives still in the running ==
+
+=== Mercurial ===
+
+#mercurial: 118 members
+
+Advantages:
+
+ * Speed comparable to Git
+ * Some operations become feasible (bisect, annotate)
+ * Many helper tools
+ * Good Windows support
+ * HTTP and SSH sync possible, but unknown how this compares to Git native protocol sync speed
+
+Disadvantages:
+
+ * Similar problems with bisect support as Git
+ * (Unknown: suitability of command set?)
+
 === Darcs vs Mercurial Overview ===
 
@@ -417 +438 @@
 
 Setting up a Mercurial HTTP interface: [http://hgbook.red-bean.com/hgbookch6.html#x10-1310006.6]
+
+==== Notes On Conversion ====
+
+Currently using Tailor. Problems encountered:
+ 
+ * Darcs outputs XML without an encoding header. Patched Tailor to append Latin-1 encoding to the XML output. This will be sent to the tailor author
+ * In hg.py, replace the line {{{self._hgCommand('tag', tag)}}} with {{{self._hgCommand('tag', tag, force=True)}}} because we seem to be trying to apply duplicate tags at some points. Don't know quite how this is possible!
+ * MUST USE the seperate-subdir mode of Tailor because we have some tricky Darcs patches. I've added my scripts to http://www.selenic.com/mercurial/wiki/index.cgi/Tailor#preview
+ * No support for author remapping in Tailor yet. I've added it and I'm going to submit the patch to the Tailor author
+
+=== Git ===
+
+#git: 388 members
+
+Advantages:
+  
+ * Speed
+ * Very similar workflow possible: {{{git add --patch}}}, {{{git cherry-pick}}}, and others
+ * Some operations become feasible (bisect, annotate)
+ * Many helper tools
+
+Disadvantages:
+
+ * Complex command set?  (Though, it should be possible to find replacements for the darcs commands and be happy.) 
+ * Lack of good Windows support?
+ * file and directory renames are not tracked accurately.  Merging uses heuristics to discover file/directory renames, which sometimes goes wrong.
+ * bisect support would require git modules to also pick the correct version of libraries.  Keeping this in sync is not easy, atm.
+ * uses its own protocol for network transmission (http works but is slower, however, other hosting services are available, e.g., github)
 
 === Darcs / Git Command Comparison ===
@@ -426 +475 @@
 ||{{{darcs record -a -m foo}}}||{{{git commit -a -m foo}}}||
 ||{{{darcs pull}}}||{{{git pull}}} then {{{git cherry-pick}}}/{{{gitk}}} + select patches using mouse.  It's probably best to have one local branch correspond to the remote branch and then cherry-pick from that.  You can also create local names for several remote repositories.||
-
-
-== Darcs alternatives still in the running ==
-
-=== Mercurial ===
-
-#mercurial: 118 members
-
-Advantages:
-
- * Speed comparable to Git
- * Some operations become feasible (bisect, annotate)
- * Many helper tools
- * Good Windows support
- * HTTP and SSH sync possible, but unknown how this compares to Git native protocol sync speed
-
-Disadvantages:
-
- * Similar problems with bisect support as Git
- * (Unknown: suitability of command set?)
-
-==== Notes On Conversion ====
-
-Currently using Tailor. Problems encountered:
- 
- * Darcs outputs XML without an encoding header. Patched Tailor to append Latin-1 encoding to the XML output. This will be sent to the tailor author
- * In hg.py, replace the line {{{self._hgCommand('tag', tag)}}} with {{{self._hgCommand('tag', tag, force=True)}}} because we seem to be trying to apply duplicate tags at some points. Don't know quite how this is possible!
- * MUST USE the seperate-subdir mode of Tailor because we have some tricky Darcs patches. I've added my scripts to http://www.selenic.com/mercurial/wiki/index.cgi/Tailor#preview
- * No support for author remapping in Tailor yet. I've added it and I'm going to submit the patch to the Tailor author
-
-=== Git ===
-
-#git: 388 members
-
-Advantages:
-  
- * Speed
- * Very similar workflow possible: {{{git add --patch}}}, {{{git cherry-pick}}}, and others
- * Some operations become feasible (bisect, annotate)
- * Many helper tools
-
-Disadvantages:
-
- * Complex command set?  (Though, it should be possible to find replacements for the darcs commands and be happy.) 
- * Lack of good Windows support?
- * file and directory renames are not tracked accurately.  Merging uses heuristics to discover file/directory renames, which sometimes goes wrong.
- * bisect support would require git modules to also pick the correct version of libraries.  Keeping this in sync is not easy, atm.
- * uses its own protocol for network transmission (http works but is slower, however, other hosting services are available, e.g., github)
-
-== Eliminated alternatives ==
 
 === Bzr ===
@@ -496 +495 @@
  * UI is rather different from darcs (which current contributors are used to).
 
-Reason for elimination: lack of uptake and hence more risk of Bzr becoming unmaintained.
+
+== Eliminated alternatives ==
+
 
 === Darcs ===