www/merge-tracking/index.html - subversion - Git at Google

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <style type="text/css"> /* <![CDATA[ */
   @import "../branding/css/tigris.css";
   @import "../branding/css/inst.css";
   /* ]]> */</style>
 <link rel="stylesheet" type="text/css" media="print"
   href="../branding/css/print.css"/>
 <script type="text/javascript" src="../branding/scripts/tigris.js"></script>
 <title>Merge Tracking</title>
 </head>

 <body>
 <div class="h2">

 <h2>Merge Tracking</h2>

 <p>"Make merging changes <em>simple</em>."</p>

 <div class="h3" id="internal">
 <h3>Subversion's own Merge Tracking</h3>

 <p>Development of Subversion's own merge tracking support is
 currently underway, with basic functionality expected to be included
 in Subversion 1.5.  Additional features may follow in subsequent
 releases; email the development list if you're interested
 in participating in the definition or implementation process.</p>

 <ul>
   <li><a href="requirements.html">Use Cases and Requirements</a></li>

   <li><a href="func-spec.html">Functional Specification</a></li>

   <li><a href="design.html">Design Specification</a></li>
 </ul>

 <p>The current Subversion trunk is roughly equivalent in functionality
 to <a href="http://www.orcaware.com/svn/wiki/Svnmerge.py">svnmerge.py</a>.
 It adds <a href="http://www.sqlite.org/">sqlite</a> as a dependency, and
 supports both the FSFS and BerkeleyDB Subversion file system backends.
 Tasks remaining for this implementation are tracked <a
 href="http://svn.collab.net/repos/svn/trunk/notes/merge-tracking.txt"
 >here</a>.</p>


 </div>  <!-- internal -->


 <div class="h3" id="external">
 <h3>External Merge Tracking</h3>

 <div class="h4" id="leveraged">
 <h4>Tools built on top of Subversion</h4>

 <ul>
   <li><a href="http://www.orcaware.com/svn/wiki/Svnmerge.py"
   >svnmerge</a></li>

   <li><a href="http://svk.elixus.org/">svk</a></li>
 </ul>
 </div>

 <!-- ### Do we want this info here, or buried deeper in this web
 space?
 <div class="h4" id="non-svn">
 <h4>Other tools</h4>

 <ul>
   <li><a href="http://perforce.com/">Perforce</a></li>

   <li><a href="http://www.ibm.com/software/awdtools/clearcase/support/"
   >ClearCase</a></li>

   <li><a href="http://www.bitkeeper.com/">BitKeeper</a></li>

   <li><a href="http://users.footprints.net/~kaz/mcvs.html">MetaCVS</a></li>
 </ul>
 </div>
 -->

 </div>  <!-- external -->

 <!-- TODO: "Import" from CollabNet's site (this should become a
 "tasks" or "status" document):
   <li><p><a
   href="https://scm-roadmap.extranet.collab.net/merge-tracking.html"
   >VC Team Merge Tracking Roadmap</a></p></li>
 -->

 </div>  <!-- h2 -->
 </body>
 </html>
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<style type="text/css"> /* <![CDATA[ */
	@import "../branding/css/tigris.css";
	@import "../branding/css/inst.css";
	/* ]]> */</style>
	<link rel="stylesheet" type="text/css" media="print"
	href="../branding/css/print.css"/>
	<script type="text/javascript" src="../branding/scripts/tigris.js"></script>
	<title>Merge Tracking</title>
	</head>

	<body>
	<div class="h2">

	<h2>Merge Tracking</h2>

	<p>"Make merging changes <em>simple</em>."</p>

	<div class="h3" id="internal">
	<h3>Subversion's own Merge Tracking</h3>

	<p>Development of Subversion's own merge tracking support is
	currently underway, with basic functionality expected to be included
	in Subversion 1.5. Additional features may follow in subsequent
	releases; email the development list if you're interested
	in participating in the definition or implementation process.</p>

	<ul>
	<li><a href="requirements.html">Use Cases and Requirements</a></li>

	<li><a href="func-spec.html">Functional Specification</a></li>

	<li><a href="design.html">Design Specification</a></li>
	</ul>

	<p>The current Subversion trunk is roughly equivalent in functionality
	to <a href="http://www.orcaware.com/svn/wiki/Svnmerge.py">svnmerge.py</a>.
	It adds <a href="http://www.sqlite.org/">sqlite</a> as a dependency, and
	supports both the FSFS and BerkeleyDB Subversion file system backends.
	Tasks remaining for this implementation are tracked <a
	href="http://svn.collab.net/repos/svn/trunk/notes/merge-tracking.txt"
	>here</a>.</p>


	</div> <!-- internal -->


	<div class="h3" id="external">
	<h3>External Merge Tracking</h3>

	<div class="h4" id="leveraged">
	<h4>Tools built on top of Subversion</h4>

	<ul>
	<li><a href="http://www.orcaware.com/svn/wiki/Svnmerge.py"
	>svnmerge</a></li>

	<li><a href="http://svk.elixus.org/">svk</a></li>
	</ul>
	</div>

	<!-- ### Do we want this info here, or buried deeper in this web
	space?
	<div class="h4" id="non-svn">
	<h4>Other tools</h4>

	<ul>
	<li><a href="http://perforce.com/">Perforce</a></li>

	<li><a href="http://www.ibm.com/software/awdtools/clearcase/support/"
	>ClearCase</a></li>

	<li><a href="http://www.bitkeeper.com/">BitKeeper</a></li>

	<li><a href="http://users.footprints.net/~kaz/mcvs.html">MetaCVS</a></li>
	</ul>
	</div>
	-->

	</div> <!-- external -->

	<!-- TODO: "Import" from CollabNet's site (this should become a
	"tasks" or "status" document):
	<li><p><a
	href="https://scm-roadmap.extranet.collab.net/merge-tracking.html"
	>VC Team Merge Tracking Roadmap</a></p></li>
	-->

	</div> <!-- h2 -->
	</body>
	</html>