subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r899332 - in /subversion: site/publish/logo/ trunk/notes/merge-tracking/ trunk/www/images/merge-tracking/ trunk/www/logo/ trunk/www/merge-tracking/
Date Thu, 14 Jan 2010 17:56:58 GMT
Author: cmpilato
Date: Thu Jan 14 17:56:58 2010
New Revision: 899332

URL: http://svn.apache.org/viewvc?rev=899332&view=rev
Log:
Put notes-y stuff under trunk/notes where it belongs.

* trunk/www/merge-tracking
  Move this...

* trunk/www/merge-tracking/calculate-ranges-already-merged.png,
* trunk/www/merge-tracking/handle-merge-conflicts.png,
* trunk/www/merge-tracking/perform-a-merge.png,
* trunk/www/merge-tracking/record-merge-info.png,
* trunk/www/merge-tracking/retrieve-merge-info.png,
* trunk/www/merge-tracking/revisions-to-merge.png
  ...and these...

* trunk/notes/merge-tracking
* trunk/notes/merge-tracking/calculate-ranges-already-merged.png
* trunk/notes/merge-tracking/design.html
* trunk/notes/merge-tracking/func-spec.html
* trunk/notes/merge-tracking/handle-merge-conflicts.png
* trunk/notes/merge-tracking/index.html
* trunk/notes/merge-tracking/perform-a-merge.png
* trunk/notes/merge-tracking/record-merge-info.png
* trunk/notes/merge-tracking/requirements.html
* trunk/notes/merge-tracking/retrieve-merge-info.png
* trunk/notes/merge-tracking/revisions-to-merge.png
* trunk/notes/merge-tracking/summit-survey.html
* trunk/notes/merge-tracking/summit.html
  ...to here.

* trunk/www/logo
  Then move this...

* site/publish/logo
  ...to here.

* trunk/www/images/merge-tracking
  Finally, delete this.

Added:
    subversion/site/publish/logo/
      - copied from r899321, subversion/trunk/www/logo/
    subversion/trunk/notes/merge-tracking/
      - copied from r899321, subversion/trunk/www/merge-tracking/
    subversion/trunk/notes/merge-tracking/calculate-ranges-already-merged.png
      - copied unchanged from r899321, subversion/trunk/www/images/merge-tracking/calculate-ranges-already-merged.png
    subversion/trunk/notes/merge-tracking/handle-merge-conflicts.png
      - copied unchanged from r899321, subversion/trunk/www/images/merge-tracking/handle-merge-conflicts.png
    subversion/trunk/notes/merge-tracking/perform-a-merge.png
      - copied unchanged from r899321, subversion/trunk/www/images/merge-tracking/perform-a-merge.png
    subversion/trunk/notes/merge-tracking/record-merge-info.png
      - copied unchanged from r899321, subversion/trunk/www/images/merge-tracking/record-merge-info.png
    subversion/trunk/notes/merge-tracking/retrieve-merge-info.png
      - copied unchanged from r899321, subversion/trunk/www/images/merge-tracking/retrieve-merge-info.png
    subversion/trunk/notes/merge-tracking/revisions-to-merge.png
      - copied unchanged from r899321, subversion/trunk/www/images/merge-tracking/revisions-to-merge.png
Removed:
    subversion/trunk/www/images/merge-tracking/
    subversion/trunk/www/logo/
    subversion/trunk/www/merge-tracking/
Modified:
    subversion/trunk/notes/merge-tracking/design.html
    subversion/trunk/notes/merge-tracking/func-spec.html
    subversion/trunk/notes/merge-tracking/index.html
    subversion/trunk/notes/merge-tracking/requirements.html
    subversion/trunk/notes/merge-tracking/summit-survey.html
    subversion/trunk/notes/merge-tracking/summit.html

Modified: subversion/trunk/notes/merge-tracking/design.html
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/merge-tracking/design.html?rev=899332&r1=899321&r2=899332&view=diff
==============================================================================
--- subversion/trunk/notes/merge-tracking/design.html (original)
+++ subversion/trunk/notes/merge-tracking/design.html Thu Jan 14 17:56:58 2010
@@ -2,15 +2,7 @@
 "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 Design</title>
-
 <style type="text/css">
 .question { color: grey; }
 .answer   { }

Modified: subversion/trunk/notes/merge-tracking/func-spec.html
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/merge-tracking/func-spec.html?rev=899332&r1=899321&r2=899332&view=diff
==============================================================================
--- subversion/trunk/notes/merge-tracking/func-spec.html (original)
+++ subversion/trunk/notes/merge-tracking/func-spec.html Thu Jan 14 17:56:58 2010
@@ -2,13 +2,6 @@
 "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 Functional Specification</title>
 </head>
 
@@ -657,8 +650,8 @@
 have to apply a large number of disjoint changes to the WC.</p>
 
 <p>For a longer description of this approach, see the <a
-href="/design.html#model.merging-and-ancestry">"Merging and Ancestry"
-section</a> of the original <a href="/design.html">design doc</a>.</p>
+href="design.html#model.merging-and-ancestry">"Merging and Ancestry"
+section</a> of the original <a href="design.html">design doc</a>.</p>
 
 <div class="h4" id="aslb-merge">
 <h4>Ancestry-Sensitive Line-Based Merge</h4>
@@ -927,7 +920,7 @@
 <h2>Related Documents and Discussion</h2>
 
 <ul>
-  <li><a href="http://subversion.tigris.org/merge-tracking/summit.html"
+  <li><a href="summit.html"
   >CollabNet customer Merge Tracking Summit</a></li>
 
   <li><a href="http://www.codeville.org/">Codeville</a> is reputed to

Modified: subversion/trunk/notes/merge-tracking/index.html
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/merge-tracking/index.html?rev=899332&r1=899321&r2=899332&view=diff
==============================================================================
--- subversion/trunk/notes/merge-tracking/index.html (original)
+++ subversion/trunk/notes/merge-tracking/index.html Thu Jan 14 17:56:58 2010
@@ -2,13 +2,6 @@
 "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>
 
@@ -51,14 +44,14 @@
 </p>
 
 <p>Remaining tasks for 1.5.0 are tracked in the <a
-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"
+href="http://subversion.tigris.org/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"
 >issue tracker</a>.</p>
 
 <p>Additional Merge Tracking features planned for post-1.5.0 include
 blocking of changes, misc. auditing/reporting, handling of cyclic
 merges, and other high-level features described in the recorded <a
 href="requirements.html">use cases</a>.  This list of issues can also
-be found in the <a href="/issues/">issue tracker</a> (query for the
+be found in the <a href="http://subversion.tigris.org/issues/">issue tracker</a>
(query for the
 <em>merge-tracking</em> keyword to get the comprehensive list).</p>
 
 

Modified: subversion/trunk/notes/merge-tracking/requirements.html
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/merge-tracking/requirements.html?rev=899332&r1=899321&r2=899332&view=diff
==============================================================================
--- subversion/trunk/notes/merge-tracking/requirements.html (original)
+++ subversion/trunk/notes/merge-tracking/requirements.html Thu Jan 14 17:56:58 2010
@@ -2,13 +2,6 @@
 "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 Requirements and Use Cases</title>
 </head>
 
@@ -505,7 +498,7 @@
 <h2>Related Documents and Discussion</h2>
 
 <ul>
-  <li><a href="http://subversion.tigris.org/merge-tracking/summit.html"
+  <li><a href="summit.html"
   >CollabNet customer Merge Tracking Summit</a></li>
 
   <li><a

Modified: subversion/trunk/notes/merge-tracking/summit-survey.html
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/merge-tracking/summit-survey.html?rev=899332&r1=899321&r2=899332&view=diff
==============================================================================
--- subversion/trunk/notes/merge-tracking/summit-survey.html (original)
+++ subversion/trunk/notes/merge-tracking/summit-survey.html Thu Jan 14 17:56:58 2010
@@ -2,15 +2,7 @@
 "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>CollabNet Merge Tracking Summit Survey</title>
-
 <style type="text/css">
 .question { color: grey; }
 .answer   { }

Modified: subversion/trunk/notes/merge-tracking/summit.html
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/merge-tracking/summit.html?rev=899332&r1=899321&r2=899332&view=diff
==============================================================================
--- subversion/trunk/notes/merge-tracking/summit.html (original)
+++ subversion/trunk/notes/merge-tracking/summit.html Thu Jan 14 17:56:58 2010
@@ -2,13 +2,6 @@
 "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>CollabNet Merge Tracking Summit</title>
 </head>
 



Mime
View raw message