www/merge-tracking/index.html

   1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   2 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
   3 <html xmlns="http://www.w3.org/1999/xhtml">
   4 <head>
   5 <style type="text/css"> /* <![CDATA[ */
   6   @import "../branding/css/tigris.css";
   7   @import "../branding/css/inst.css";
   8   /* ]]> */</style>
   9 <link rel="stylesheet" type="text/css" media="print"
  10   href="../branding/css/print.css"/>
  11 <script type="text/javascript" src="../branding/scripts/tigris.js"></script>
  12 <title>Merge Tracking</title>
  13 </head>
  14
  15 <body>
  16 <div class="h2">
  17
  18 <h2>Merge Tracking</h2>
  19
  20 <p>"Make merging changes <em>simple</em>."</p>
  21
  22 <div class="h3" id="internal">
  23 <h3>Subversion's own Merge Tracking</h3>
  24
  25 <p>Development of Subversion's own merge tracking support is
  26 currently underway, with basic functionality expected to be included
  27 in Subversion 1.5.  Additional features may follow in subsequent
  28 releases; email the development list if you're interested
  29 in participating in the definition or implementation process.</p>
  30
  31 <ul>
  32   <li><a href="requirements.html">Use Cases and Requirements</a></li>
  33
  34   <li><a href="func-spec.html">Functional Specification</a></li>
  35
  36   <li><a href="design.html">Design Specification</a></li>
  37 </ul>
  38
  39 <p>Merge Tracking in Subversion 1.5.0 is roughly equivalent in
  40 functionality to <a
  41 href="http://www.orcaware.com/svn/wiki/Svnmerge.py">svnmerge.py</a>,
  42 recording and using merge history to avoid common cases of the
  43 repeated merge problem, and allowing for cherry-picking of changes.
  44 It exposes merge history via properties, and allows for repository
  45 dump/load (including the ability to re-create the merge history
  46 index).  It adds <a href="http://www.sqlite.org/">sqlite</a> as a
  47 dependency, and supports both the FSFS and BerkeleyDB Subversion file
  48 system backends.</p>
  49
  50 <p>Remaining tasks for 1.5.0 are tracked in the <a
  51 href="/issues/buglist.cgi?component=subversion&amp;issue_status=NEW&amp;issue_status=STARTED&amp;issue_status=REOPENED&amp;target_milestone=1.5&amp;keywords=merge-tracking&amp;keywords_type=anytokens&amp;cmdtype=doit&amp;order=%27Importance%27&amp;Submit+query=Submit+query"
  52 >issue tracker</a>.</p>
  53
  54 <p>Additional Merge Tracking features planned for post-1.5.0 include
  55 blocking of changes, misc. auditing/reporting, handling of cyclic
  56 merges, and other high-level features described in the recorded <a
  57 href="requirements.html">use cases</a>.  This list of issues can also
  58 be found in the <a href="/issues/">issue tracker</a> (query for the
  59 <em>merge-tracking</em> keyword to get the comprehensive list).</p>
  60
  61
  62 </div>  <!-- internal -->
  63
  64
  65 <div class="h3" id="external">
  66 <h3>External Merge Tracking</h3>
  67
  68 <div class="h4" id="leveraged">
  69 <h4>Tools built on top of Subversion</h4>
  70
  71 <ul>
  72   <li><a href="http://www.orcaware.com/svn/wiki/Svnmerge.py"
  73   >svnmerge</a></li>
  74
  75   <li><a href="http://svk.elixus.org/">svk</a></li>
  76 </ul>
  77 </div>
  78
  79 <!-- ### Do we want this info here, or buried deeper in this web
  80 space?
  81 <div class="h4" id="non-svn">
  82 <h4>Other tools</h4>
  83
  84 <ul>
  85   <li><a href="http://perforce.com/">Perforce</a></li>
  86
  87   <li><a href="http://www.ibm.com/software/awdtools/clearcase/support/"
  88   >ClearCase</a></li>
  89
  90   <li><a href="http://www.bitkeeper.com/">BitKeeper</a></li>
  91
  92   <li><a href="http://users.footprints.net/~kaz/mcvs.html">MetaCVS</a></li>
  93 </ul>
  94 </div>
  95 -->
  96
  97 </div>  <!-- external -->
  98
  99 <!-- TODO: "Import" from CollabNet's site (this should become a
 100 "tasks" or "status" document):
 101   <li><p><a
 102   href="https://scm-roadmap.extranet.collab.net/merge-tracking.html"
 103   >VC Team Merge Tracking Roadmap</a></p></li>
 104 -->
 105
 106 </div>  <!-- h2 -->
 107 </body>
 108 </html>