Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > subclipse commit: r1394 - in trunk/subclipse/ui/html: dailywork images reference

subclipse
Discussion topic

Back to topic list

subclipse commit: r1394 - in trunk/subclipse/ui/html: dailywork images reference

Author jespersm
Full name Jesper Steen Møller
Date 2005-06-19 14:36:51 PDT
Message Author: jespersm
Date: Sun Jun 19 16:36:48 2005
New Revision: 1394

Added:
   trunk/subclipse/ui/h​tml/images/add-to-sv​nignore.jpg (contents, props changed)
   trunk/subclipse/ui/h​tml/images/commit-wi​th-issuetracker.jpg (contents, props changed)
   trunk/subclipse/ui/h​tml/images/history-w​ith-issuetracker-lin​k.jpg (contents, props changed)
   trunk/subclipse/ui/h​tml/reference/issuet​racker.html
   trunk/subclipse/ui/h​tml/reference/unlock​.html
Modified:
   trunk/subclipse/ui/h​tml/dailywork/workcy​cle.html
   trunk/subclipse/ui/h​tml/faq/subversion-m​apping.html
   trunk/subclipse/ui/h​tml/reference/add.ht​ml
   trunk/subclipse/ui/h​tml/reference/lock.h​tml
   trunk/subclipse/ui/h​tml/reference/svn-ig​nore.html
   trunk/subclipse/ui/h​tml/reference/svn-pr​operties-view.html
   trunk/subclipse/ui/h​tml/reference/team-s​ynchronize.html

Log:
html/dailywork/workcycle.html
* Clarified the feature where you can add unversioned resources during commit.

html/faq/subversion-​mapping.html
* Added lock
* Added unlock

html/reference/svn-ignore.html
* Added a nice picture

html/reference/add.html
* Minor change to emphasize name of command.

html/reference/unlock.html
* Added text for unlock (no pictures)

html/reference/team-​synchronize.html
* Corrected link to CVS Synchronize

html/reference/issue​tracker.html
* Added missing resource

html/reference/svn-p​roperties-view.html
* Minor typographical change

html/reference/lock.html
* Added link to unlock and information about stealing locks.

html/images/commit-w​ith-issuetracker.jpg​
html/images/history-​with-issuetracker-li​nk.jpg
html/images/add-to-s​vnignore.jpg
* Added images for help

Modified: trunk/subclipse/ui/h​tml/dailywork/workcy​cle.html
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/dailywork/workcy​cle.html?rev=1394​&p1=trunk/subclipse​/ui/html/dailywork/w​orkcycle.html&p2​=trunk/subclipse/ui/​html/dailywork/workc​ycle.html&r1=139​3&r2=1394
====================​====================​====================​==================
--- trunk/subclipse/ui/h​tml/dailywork/workcy​cle.html (original)
+++ trunk/subclipse/ui/h​tml/dailywork/workcy​cle.html Sun Jun 19 16:36:48 2005
@@ -29,8 +29,8 @@
     
     <p>Eclipse will catch your changes and refactorings, as long as you use
     Eclipse to work with your working copy. You may contrast this with working with the Subversion
- command line tool which need to be told about every rename, delete and move operation that
- you do in the working copy. Subclipse does this for you.</p>
+ command line tool which needs to perform about every rename, delete and move operation that
+ you want in the working copy. Subclipse does this for you.</p>
 
     <p>One exception from this is adding resources: The new file(s) or folder(s) you create
     must be added to your working copy, using the command <a href="../reference/a​dd.html">Add to Source Control</a> found in the
@@ -39,7 +39,14 @@
     meaning that an unknown file is present in your working copy.
     Once added however, the resource is marked with an asterisk (*)</p>
 
- <p>Eventually, when you commit your changes, this marking will disappear.</p>
+ <p>Eventually, when you commit your changes, this marking will disappear.
+ If you forget to add a resource, it will still be presented in the
+ <a href="../reference/c​ommit.html">commi​t dialog</a>, but will be de-selected
+ by default.</p>
+
+ <p>To ensure exclusive access when editing a file, you may
+ <a href="../reference/l​ock.html">lock​</a> it if your repository is based on
+ Subversion 1.2 or better.
         
     <h2>Updating your working copy with other people's committed changes</h2>
     

Modified: trunk/subclipse/ui/h​tml/faq/subversion-m​apping.html
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/faq/subversion-m​apping.html?rev=1394​&p1=trunk/subcli​pse/ui/html/faq/subv​ersion-mapping.html​&p2=trunk/subclip​se/ui/html/faq/subve​rsion-mapping.html​&r1=1393&r2=13​94
====================​====================​====================​==================
--- trunk/subclipse/ui/h​tml/faq/subversion-m​apping.html (original)
+++ trunk/subclipse/ui/h​tml/faq/subversion-m​apping.html Sun Jun 19 16:36:48 2005
@@ -30,6 +30,16 @@
       <td></td>
     </tr>
     <tr>
+ <td><tt>​lock</tt></​td>
+ <td><a href="../reference/l​ock">Team &gt; Lock</a></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><tt>​unlock</tt>​</td>
+ <td><a href="../reference/u​nlock">Team &gt; Unlock</a></td>
+ <td></td>
+ </tr>
+ <tr>
       <td><tt>​cat</tt></t​d>
       <td><a href="../reference/s​vn-repository-view.h​tml">SVN Repository View</a></td>
       <td></td>

Added: trunk/subclipse/ui/h​tml/images/add-to-sv​nignore.jpg
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/images/add-to-sv​nignore.jpg?rev=1394​
====================​====================​====================​==================
Binary file. No diff available.

Added: trunk/subclipse/ui/h​tml/images/commit-wi​th-issuetracker.jpg
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/images/commit-wi​th-issuetracker.jpg?​rev=1394
====================​====================​====================​==================
Binary file. No diff available.

Added: trunk/subclipse/ui/h​tml/images/history-w​ith-issuetracker-lin​k.jpg
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/images/history-w​ith-issuetracker-lin​k.jpg?rev=1394
====================​====================​====================​==================
Binary file. No diff available.

Modified: trunk/subclipse/ui/h​tml/reference/add.ht​ml
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/reference/add.ht​ml?rev=1394&p1=t​runk/subclipse/ui/ht​ml/reference/add.htm​l&p2=trunk/subcl​ipse/ui/html/referen​ce/add.html&r1=1​393&r2=1394
====================​====================​====================​==================
--- trunk/subclipse/ui/h​tml/reference/add.ht​ml (original)
+++ trunk/subclipse/ui/h​tml/reference/add.ht​ml Sun Jun 19 16:36:48 2005
@@ -13,7 +13,7 @@
 
 <p>When you share a project for the first time, or when you add or import new
 resources to a project, you need to tell Subversion to keep it (or them) under version control.
-To do this, use the <img src="../../icons/ful​l/tortoise/add.gif"​> Add command</p>
+To do this, use the <img src="../../icons/ful​l/tortoise/add.gif"​> 'Add' command</p>
 
 <h2>Using this command</h2>
 <p>First, find and select the unversioned resource(s) that you want to add.

Added: trunk/subclipse/ui/h​tml/reference/issuet​racker.html
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/reference/issuet​racker.html?rev=1394​
====================​====================​====================​==================
--- (empty file)
+++ trunk/subclipse/ui/h​tml/reference/issuet​racker.html Sun Jun 19 16:36:48 2005
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Subclipse's Support for Issue Trackers</title>
+</head>
+
+<body>
+
+<h1>Subclipse's Support for Issue Trackers</h1>
+
+<p>Compared to CVS, Subversion has some novel features, one of which is (versioned) properties. These
+are used internally in Subversion (like <tt>svn:keywor​ds</tt>, <tt>svn:ignore​</tt>), but they also provide
+a convenient hook into various Subversion tool sets.</p>
+<p>One such Subversion tool, the popular <a href="http://tortoisesvn.tigris.org">TortoiseSVN</a>
+shell extension, was the first to define Subversion properties for controlling integration
+to issue tracker systems (like Bugzilla, etc.), enabling a special field for entering an issue number/identifier
+with each commit, and supporting a direct link from a log (History) message back to the issue tracker.</p>
+
+<p>These properties and the expected behavior of th Subversion tool is described at:<br>
+<a href="http://svn.collab.ne​t/repos/tortoisesvn/​trunk/doc/issuetrack​ers.txt">&lt;http://svn.collab.ne​t/repos/tortoisesvn/​trunk/doc/issuetrack​ers.txt&gt;</​a>
+
+<p>Subclipse supports the following Issue tracking properties:</p>
+<ul>
+<li>bugtraq:message
+<li>bugtraq:label
+<li>bugtraq:url
+<li>bugtraq:number
+<li>bugtraq:w​arnifnoissue
+<li>bugtraq:append
+</ul>
+
+<p>Support for issue trackers is covered in the <a href="../reference/c​ommit.html">Commi​t</a> and
+<a href="../reference/b​ranch-tag.html">B​ranch/Tag</a> dialogs, and the <a href="../reference/s​vn-history-view.html​">SVN Resource History View</a>.</p>
+
+<p><img src="../images/commi​t-with-issuetracker.​jpg" alt="The user can (or should) enter the ID or number of an issue in order to issue a commit"></p>
+
+<p>In the history view, a hyperlink is displayed to launch the issue tracking system in a browser (if configured).
+Many popular issue tracker systems can be integrated with using this approach.</p>
+
+<p><img src="../images/histo​ry-with-issuetracker​-link.jpg" alt="The issue number is a link back to the web page descring the bug (displayed in a web application configured in the properties)"></p>
+
+<h3>Reference</h3>
+<p>
+<a href="../reference/c​ommit.html">Team > Commit</a><br>
+<a href="../reference/s​vn-history-view.html​">SVN Resource History View</a></p>
+
+</body>
+</html>

Modified: trunk/subclipse/ui/h​tml/reference/lock.h​tml
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/reference/lock.h​tml?rev=1394&p1=​trunk/subclipse/ui/h​tml/reference/lock.h​tml&p2=trunk/sub​clipse/ui/html/refer​ence/lock.html&r​1=1393&r2=1394
====================​====================​====================​==================
--- trunk/subclipse/ui/h​tml/reference/lock.h​tml (original)
+++ trunk/subclipse/ui/h​tml/reference/lock.h​tml Sun Jun 19 16:36:48 2005
@@ -21,13 +21,15 @@
 
 <p><img src="../images/lock-dialog.jpg" alt="About to lock NiceClass.java"></p>
 
-<p>Once locked, the resource has a check-mark next to it:</p>
+<p>Once locked by you, the resource has a check-mark next to it.<br>
+<img src="../images/locke​d-marker.jpg" alt="NiceClass.java is now locked by you"><br>
+If you commit a change to a locked file, the lock is usuall unlocked, unless you select 'Keep locks' in
+the <a href="../reference/c​ommit.html">commi​t dialog</a>.
+Alternatively, you can <a href="../reference/u​nlock.html">unloc​k</a> the resource again.</p>
 
-<p><img src="../images/locke​d-marker.jpg" alt="NiceClass.java is now locked by you"></p>
-
-<p>TODO: How about stealing locks?</p>
-<p>TODO: Add unlock?</p>
-<p>TODO: Add to Subversion comparison chart?</p>
+<p>Subversion also makes it possible to <em>steal</em> a lock,
+if a different user has locked a file and you need to take it over.
+This is accomplished by selecting the 'Steal Lock' option found in the dialog.</p>
 
 <blockquote>TIP: If you want to ensure that a specific file is <strong>always​</strong> locked before committing,
 you can set the Subversion property <tt>svn:needs-​lock</tt> on the file (and commit). This ensures that a lock must
@@ -37,7 +39,9 @@
 <p><a href="../dailywork/w​orkcycle.html">Ty​pical work cycle: Edit, Update, Commit</a></p>
 
 <h3>Reference</h3>
-<p><a href="../reference/s​et-property.html"​>Team > Set Property</a><br>
+<p>
+<a href="../reference/u​nlock.html">Team > Unlock</a><br>
+<a href="../reference/s​et-property.html"​>Team > Set Property</a><br>
 <a href="../reference/s​vn-properties-view.h​tml">SVN Properties View</a></p>
 
 </body>

Modified: trunk/subclipse/ui/h​tml/reference/svn-ig​nore.html
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/reference/svn-ig​nore.html?rev=1394​&p1=trunk/subclips​e/ui/html/reference/​svn-ignore.html&​p2=trunk/subclipse/u​i/html/reference/svn​-ignore.html&r1=​1393&r2=1394
====================​====================​====================​==================
--- trunk/subclipse/ui/h​tml/reference/svn-ig​nore.html (original)
+++ trunk/subclipse/ui/h​tml/reference/svn-ig​nore.html Sun Jun 19 16:36:48 2005
@@ -1,5 +1,3 @@
-
-
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 
 <html>
@@ -25,7 +23,9 @@
 <li>By a custom pattern that you enter (e.g. <tt>log*.txt​</tt>)</li​>
 </ul>
 <p>When in doubt, choose the first option ("By resource name"), since that will never ignore a resource that wasn't explicitly selected and ignored.
-<p>TODO: Add a nice picture.</p>
+
+<p><img src="../images/add-t​o-svnignore.jpg" alt="You may ignore the resource(s) by name or by pattern."></p>
+
 <h3>See also:</h3>
 <p><a href="svn-properties​-view.html">SVN Properties View</a>.</p>
 <p><a href="show-propertie​s.html">Team &gt; Show Properties</a>.</p>

Modified: trunk/subclipse/ui/h​tml/reference/svn-pr​operties-view.html
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/reference/svn-pr​operties-view.html?r​ev=1394&p1=trunk​/subclipse/ui/html/r​eference/svn-propert​ies-view.html&p2​=trunk/subclipse/ui/​html/reference/svn-p​roperties-view.html​&r1=1393&r2=1​394
====================​====================​====================​==================
--- trunk/subclipse/ui/h​tml/reference/svn-pr​operties-view.html (original)
+++ trunk/subclipse/ui/h​tml/reference/svn-pr​operties-view.html Sun Jun 19 16:36:48 2005
@@ -35,6 +35,6 @@
 <h3>Additional Information</h3>
 <p>Example of using Subversion properties for adding metadata to repositories (external link):
 &lt;<a href="http://svn.collab.ne​t/repos/tortoisesvn/​trunk/doc/issuetrack​ers.txt">http://svn.collab.ne​t/repos/tortoisesvn/​trunk/doc/issuetrack​ers.txt</a>​&gt;<br>
-This resource is submitted by the <a href="http://tortoisesvn.tigris.org">TortoiseSVN<​/a>project.
+This resource is submitted by the <a href="http://tortoisesvn.tigris.org">TortoiseSVN</a> project.
 </body>
 </html>

Modified: trunk/subclipse/ui/h​tml/reference/team-s​ynchronize.html
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/reference/team-s​ynchronize.html?rev=​1394&p1=trunk/su​bclipse/ui/html/refe​rence/team-synchroni​ze.html&p2=trunk​/subclipse/ui/html/r​eference/team-synchr​onize.html&r1=13​93&r2=1394
====================​====================​====================​==================
--- trunk/subclipse/ui/h​tml/reference/team-s​ynchronize.html (original)
+++ trunk/subclipse/ui/h​tml/reference/team-s​ynchronize.html Sun Jun 19 16:36:48 2005
@@ -16,7 +16,7 @@
 repositories. It can be switched to like any other perspective in Eclipse, or invoked directly by selecting 'Team &gt; Synchronize...'</p>
 <p>Note that invoking this action does not entail any changes being synchronized without your approval!</p>
 <h2>Working with the Team Synchronizing Perspective</h2>
-<p>Most of the documentation on synchronization in the <a href="../../../org.e​clipse.platform.doc.​user/reference/ref-3​3.htm'>main Eclipse documentation</a>
+<p>Most of the documentation on synchronization in the <a href="../../../org.e​clipse.platform.doc.​user/reference/ref-3​3.htm">main Eclipse documentation</a>
 applies to Subclipse's sync support.
 
 <h2>Synchronization compared to Subversion terminology</h2>

Added: trunk/subclipse/ui/h​tml/reference/unlock​.html
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/h​tml/reference/unlock​.html?rev=1394
====================​====================​====================​==================
--- (empty file)
+++ trunk/subclipse/ui/h​tml/reference/unlock​.html Sun Jun 19 16:36:48 2005
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Team &gt; Unlock</title>
+</head>
+
+<body>
+
+<h1>Team &gt; Unlock</h1>
+
+<p>Using the new features in Subversion 1.2, you can lock one or more files for editing. This is useful for
+Once done with the resource, you may unlock it so that other team members can edit the file.
+</p>
+
+<p>The unlock command is issued from the 'Team' context menu of the resource.</p>
+
+<h3>Tasks:</h3>
+<p><a href="../dailywork/w​orkcycle.html">Ty​pical work cycle: Edit, Update, Commit</a></p>
+
+<h3>Reference</h3>
+<p><a href="../reference/l​ock.html">Team > Lock</a></p>
+
+</body>
+</html>
\ No newline at end of file

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

subclipse commit: r1394 - in trunk/subclipse/ui/html: dailywork images reference jespersm Jesper Steen Møller 2005-06-19 14:36:51 PDT
Messages per page: