/plugins/SVNPlugin/trunk/src/docs/index.html

# · HTML · 1168 lines · 1046 code · 122 blank · 0 comment · 0 complexity · 4583facc05a7293109834f8c638767fd MD5 · raw file

  1. <html>
  2. <head>
  3. <title>SVN Plugin</title>
  4. </head>
  5. <body>
  6. <h1>Subversion Plugin</h1>
  7. <p>
  8. Author: Dale Anson
  9. </p>
  10. <p>
  11. <a href="#intro">Intro</a><br>
  12. <a href="#installation">Installation</a><br>
  13. <a href="#0">Dockables</a><br>
  14. <a href="#1">Checking out a project</a><br>
  15. <a href="#1a">Option Settings</a><br>
  16. <a href="#2">Creating a project from existing files</a><br>
  17. <a href="#3">Handling individual files</a><br>
  18. <a href="#4">How to undelete a deleted file</a><br>
  19. <a href="#41">Merging</a><br>
  20. <a href="#5">Bugtraq</a><br>
  21. <a href="#50">Licenses</a><br>
  22. </p>
  23. <hr>
  24. <p>
  25. <a name="intro"><h2>Intro</h2></a>
  26. </p>
  27. <p>
  28. Subversion is a powerful, open source version control system designed as a replacement for the popular Concurrent Versions System (CVS). It offers many enhancements to CVS, such as versioned directories and atomic commits, and is architected for simpler, more flexible network access.
  29. </p>
  30. <p>
  31. The SVNPlugin is a plugin for using Subversion from within jEdit. This is an all Java implementation, using the SVNKit library internally, so no external libraries or subversion clients are required. This guide assumes you have some experience with Subversion.
  32. </p>
  33. <p>
  34. <b><i>
  35. As of version 1.2.3, this plugin supports backwards compatibility with older svn clients. This means your working copy file formats will NOT be automatically upgraded to the latest version, as was the case in the past. You can change the working copy version on a per project basis by using the project properties in ProjectViewer.
  36. </i></b>
  37. </p>
  38. <p>
  39. For Subversion command reference and general Subversion information, see the official Subversion reference manual:
  40. <a href="http://svnbook.red-bean.com/index.en.html" title="English"
  41. hreflang="en" lang="en" rel="alternate">Subversion Book</a> <br>
  42. </p>
  43. <p>
  44. This plugin is tightly integrated with ProjectViewer, and most commands are available by right clicking on files or folders in the ProjectViewer trees. Some commands for the current file are also available in the jEdit text area context menu. The SVN Browser has commands to work directly with repository files without needing to have a local copy of the files.
  45. </p>
  46. <hr>
  47. <p>
  48. <a name="installation"><h2>Installation</h2></a>
  49. </p>
  50. <p>
  51. Install SVNPlugin from within jEdit like any other plugin:
  52. <ol>
  53. <li>Click Plugins -&gt; Plugin Manager</li>
  54. <li>Select the "Install" tab.</li>
  55. <li>Check "SVNPlugin"</li>
  56. <li>Click the "Install" button</li>
  57. </ol>
  58. </p>
  59. <p>
  60. SVNPlugin depends on the Project Viewer, Common Controls, and JDiff plugins. If you don't have these plugins installed, Plugin Manager will install them for you.
  61. </p>
  62. <hr>
  63. <p>
  64. <a name="0"><h2>Dockables</h2></a>
  65. </p>
  66. <p>
  67. The Subversion plugin provides 2 dockables to jEdit:<br>
  68. <ol>
  69. <li><a href="#svn_browser">SVN Browser</a></li>
  70. <li><a href="#svn_console">SVN Console</a></li>
  71. </ol>
  72. </p>
  73. <p>
  74. Access the dockables via the Plugins menu, Plugins -&gt; SVN Plugin -&gt; SVN Browser or SVN Console.
  75. </p>
  76. <p>
  77. You can dock them for easier access using Utilities -&gt; Global Options... -&gt; Docking.
  78. </p>
  79. <p>
  80. <a name="svn_browser"><h3>SVN Browser</h3></a>
  81. </p>
  82. <p>
  83. The SVN Browser is best docked at either the left or right:<br>
  84. <br>
  85. <img src="svn_browser.jpg">
  86. </p>
  87. <p>
  88. <h4>SVN Browser Buttons</h4>
  89. </p>
  90. <p>
  91. <table border="0">
  92. <tr>
  93. <td>
  94. <img src="add_repos.jpg">
  95. </td>
  96. <td>This button allows you to add a new repository to the SVN Browser.<td>
  97. </tr>
  98. </table>
  99. <br>
  100. Clicking this button brings up this dialog:<br>
  101. <br>
  102. <img src="add_repos_dialog.jpg"><br>
  103. <br>
  104. <ul>
  105. <li>Name: This is for a user-friendly name for the repository, like "jEdit Plugins".
  106. This can be whatever name you want for this repository.</li>
  107. <li>URL: This is the URL for the repository.</li>
  108. <li>Username: This is a username to access the repository. If the repository allows
  109. anonymous access, you can leave this blank.</li>
  110. <li>Password: The password that goes with Username.</li>
  111. </ul>
  112. </p>
  113. <p>
  114. <table border="0">
  115. <tr>
  116. <td>
  117. <img src="edit_repos.jpg">
  118. </td>
  119. <td>This button allows you to edit the settings for a repository.<td>
  120. </tr>
  121. </table>
  122. <br>
  123. Clicking this button brings up this dialog:<br>
  124. <br>
  125. <img src="edit_repos_dialog.jpg"><br>
  126. <br>
  127. These fields are identical to those in the Add Repository dialog shown above.
  128. </p>
  129. <p>
  130. <table border="0">
  131. <tr>
  132. <td>
  133. <img src="remove_repos.jpg">
  134. </td>
  135. <td>This button allows you to remove a repository from the SVN Browser. This
  136. does <strong>NOT</strong> delete anything from the repository or your local
  137. file system. It only removes the repository from the SVN Browser drop down
  138. list.<td>
  139. </tr>
  140. </table>
  141. <br>
  142. Clicking this button brings up this dialog:<br>
  143. <br>
  144. <img src="remove_repos_dialog.jpg"><br>
  145. <br>
  146. You must confirm to actually remove the repository from the SVN Browser.
  147. </p>
  148. <p>
  149. <table border="0">
  150. <tr>
  151. <td>
  152. <img src="refresh_repos.jpg">
  153. </td>
  154. <td>This button refreshes the SVN Browser from the currently selected repository.
  155. The SVN Browser tree is lazy-loaded since it can take some time to retrieve the
  156. repository data necessary to construct the tree. Folder contents are fetched only
  157. when the folder is expanded to show its contents. The refresh button will bring in
  158. any new data that may have been added since the last time the tree was loaded. Note that this button only refreshes the currently selected item in the tree, which is handy for situations where you have a large tree and only need to refresh a small part of it. If no node is selected in the tree, then the entire tree will be refreshed.<td>
  159. </tr>
  160. </table>
  161. <br>
  162. <br>
  163. <p>
  164. Right clicking on an item in the tree will show this popup menu:<br>
  165. <br>
  166. <img src="browser_context_menu.jpg">
  167. <br>
  168. The commands available on this menu are standard Subversion commands and shouldn't
  169. need additional explanation, although the "Checkout..." command is covered in some
  170. detail below.
  171. </p>
  172. <br>
  173. </p>
  174. <a name="svn_console">
  175. <h3>SVN Console</h3>
  176. </a>
  177. <p>
  178. The SVN Console has two main functions, first, it shows the raw output of the
  179. subversion command, and second, it shows the output of a command in a nice,
  180. GUI way.
  181. </p>
  182. <p>
  183. This dockable is best docked at the bottom of jEdit.
  184. </p>
  185. <p>
  186. Here is a shot of the SVN Console after running an "Info" command:<br>
  187. <br>
  188. <img src="svn_console_1.jpg"><br>
  189. <br>
  190. The "SVN Console" tab cannot be closed.
  191. </p>
  192. <p>
  193. And here is a shot of the Info command results:<br>
  194. <br>
  195. <img src="svn_console.jpg"><br>
  196. <br>
  197. The "Info" tab can be closed by clicking on the "X". It can also be closed
  198. by right clicking on it and choosing "Close". If there are multiple tabs open,
  199. they can all be closed by right clicking on any tab and choosing "Close All".
  200. Again, the "SVN Console" tab cannot be closed.
  201. </p>
  202. <p>
  203. Most commands show their output in a table or tree format. The table outputs
  204. are generally "editable", that is, they can be clicked on and the text can
  205. be selected for copying and pasting elsewhere. Many output displays also
  206. provide additional commands that can be accessed by right clicking on the
  207. output. For example, the "Status" command provides the ability to commit,
  208. add, revert, and so on. Most table outputs at least provide a "Zoom" option,
  209. this command will show the contents of a table cell in a popup window so that
  210. the full text can be viewed at once, and this text is selectable from the
  211. popup.
  212. </p>
  213. <hr>
  214. <p>
  215. <a name="1"><h2>Checking out a project</h2></a>
  216. </p>
  217. <p>
  218. If you are wanting to check out some files from a Subversion repository for the
  219. first time, do this:
  220. <br>
  221. <ol>
  222. <li>
  223. Right click on a directory or file in the SVN Browser, and choose "Checkout...".
  224. </li>
  225. <li>
  226. Fill in this dialog:<br>
  227. <br>
  228. <img src="checkout_dialog.jpg"><br>
  229. <br>
  230. <ul>
  231. <li>URL: should be filled in for you.</li>
  232. <li>Path: enter the location on your computer to put the files.</li>
  233. <li>Username and Password: username and password to access the repository. You can leave this blank if
  234. the repository allows anonymous access.</li>
  235. </ul>
  236. </li>
  237. <li>
  238. Wait for the files to be checked out.
  239. </li>
  240. <li>
  241. Choose "Yes" to create a project in Project Viewer:<br>
  242. <br>
  243. <img src="create_project_dialog.jpg"><br>
  244. <br>
  245. </li>
  246. <li>
  247. Fill in the information necessary to create the project:<br>
  248. </br>
  249. <img src="create_project_dialog_2.jpg"><br>
  250. <br>
  251. </li>
  252. <li>
  253. Last, actually import your files into your project. Be sure to choose the "Use CVS or SVN entries file" or
  254. all the .svn files will end up in your Project, which you probably don't want:<br>
  255. <br>
  256. <img src="initial_import.jpg"><br>
  257. <br>
  258. Project Viewer will automatically switch to your new project so you can begin working immediately.
  259. </li>
  260. </ol>
  261. <br>
  262. The ProjectViewer trees show the SVN status of files using these icons:
  263. <br>
  264. <br>&nbsp;&nbsp;<img src="added.png">&nbsp;&nbsp;The file has been scheduled for "add" to the repository.<br>
  265. <br>&nbsp;&nbsp;<img src="conflict.png">&nbsp;&nbsp;The file has a conflict that needs to be resolved.<br>
  266. <br>&nbsp;&nbsp;<img src="deleted.png">&nbsp;&nbsp;The file has been deleted from the repository.<br>
  267. <br>&nbsp;&nbsp;<img src="ignored.png">&nbsp;&nbsp;The file is ignored by Subversion.<br>
  268. <br>&nbsp;&nbsp;<img src="locked.png">&nbsp;&nbsp;The file is locked by Subversion.<br>
  269. <br>&nbsp;&nbsp;<img src="modified.png">&nbsp;&nbsp;The file has local modifications.<br>
  270. <br>&nbsp;&nbsp;<img src="normal.png">&nbsp;&nbsp;The file is up to date.<br>
  271. <br>&nbsp;&nbsp;<img src="outofdate.png">&nbsp;&nbsp;The file is out of date.<br>
  272. <br>&nbsp;&nbsp;<img src="readonly.png">&nbsp;&nbsp;The file is read only.<br>
  273. <br>&nbsp;&nbsp;<img src="unversioned.png">&nbsp;&nbsp;The file is not under version control.<br>
  274. <br>
  275. </p>
  276. <hr>
  277. <a name="1a">
  278. <h2>Option Settings</h2>
  279. </a>
  280. <p>
  281. Option settings are accessed from Plugins - Plugin Options - Subversion. Currently, there is only one setting for this plugin, whether or not to use a "tsvn:logtemplate" property as a template for commit messages. This is a property defined by the Tortoise SVN project and supported by many Subversion clients. It allows a template for commit comments to be set, usually on a project basis. Usually, this property is in set in Subversion on the top level folder and applies to all files contained within the folder. If checked, it may take slightly longer for a commit dialog to appear, as the SVN Plugin will need to query the Subversion server for the value of this property. Once the commit dialog does appear, the commit template will be displayed, which helps programmers remember to fill in particular pieces of information, such as bug number, reviewed by, and so on.
  282. </p>
  283. <hr>
  284. <a name="2">
  285. <h2>Creating a Project From Existing Files</h2>
  286. </a>
  287. <p>
  288. Suppose you have a directory of files already checked out from a Subversion
  289. repository. You can create a project from these files like this:
  290. </p>
  291. <p>
  292. <ol>
  293. <li>Activate the Project Viewer plugin.</li>
  294. <li>From the drop down at the top of Project Viewer, browse to the place you
  295. want to create the project and select "New project here".</li>
  296. <li>Fill in the dialog:<br>
  297. <br>
  298. <img src="create_new_project_dialog.jpg"><br>
  299. <br>
  300. Be sure to select "Subversion" from the Version Control drop down.
  301. <br>
  302. </li>
  303. <li>
  304. Next, you'll be asked to import your files into your project. Be sure to choose the "SVN Entries" filter or
  305. all the .svn files will end up in your Project, which you probably don't want:<br>
  306. <br>
  307. <img src="initial_import.jpg"><br>
  308. <br>
  309. Project Viewer will automatically switch to your new project so you can begin working immediately.<br>
  310. <br>
  311. </li>
  312. <li>
  313. Right click on the top node of your project and select "Properties". Select "Subversion" from the version control dropdown if it is not selected already. Select
  314. "Subversion settings" from the left panel. The URL should be filled in for you.
  315. If the repository requires a username and password, fill them in here, or leave the fields blank if the repository allows anonymous access. The format of your working copies is also displayed. You can change this value if you need to for compatibility with other SVN clients.<br>
  316. <br>
  317. <img src="subversion_settings.jpg"><br>
  318. <br>
  319. </li>
  320. <li>
  321. Click "OK" to save your settings.
  322. </li>
  323. </ol>
  324. </p>
  325. <hr>
  326. <p>
  327. <a name="3"><h2>Handling individual files</h2></a>
  328. </p>
  329. <p>
  330. There may be times when you are working on a file that is not in a Project Viewer
  331. project, but the file is under version control. All you want to do is update or
  332. commit that file. Several Subversion commands are available on the text area
  333. context menu. Right click anywhere in the text area and select the "Subversion"
  334. submenu:<br>
  335. <br>
  336. <img src="text_area_context_menu.jpg"><br>
  337. <br>
  338. </p>
  339. <p>
  340. Since the file may not be part of a Project Viewer project, each of the commands
  341. available on the context menu provide a place to enter the username and password
  342. for the Subversion repository. If the file does happen to be part of a Project
  343. Viewer project, the username and password will be found in the project settings
  344. and the username and password boxes will be pre-filled for you.
  345. </p>
  346. <p>
  347. Note that if the file is not in fact under version control, you will receive
  348. and error from each of these commands.
  349. </p>
  350. <hr>
  351. <p>
  352. <a name="4"><h2>How to undelete a deleted file</h2></a>
  353. </p>
  354. <p>
  355. <ol>
  356. <li>First, run the log command on the directory containing the deleted file or directory. Be sure "Show paths" is checked.</li>
  357. <li>Find the deleted file in the log output.</li>
  358. <li>Right click on the deleted file and select "Undelete" from the popup menu.</li>
  359. <li>Use the dialog to confirm the file is to be undeleted.</li>
  360. <li>Your file should be restored to its original location.</li>
  361. <li>At this point, the file is scheduled for add, so you'll still need to commit.</li>
  362. <li>That's it!</li>
  363. </ol>
  364. Don't forget that in subversion, a "move" is really a "copy" followed by a "delete". To undo a "move", your best bet
  365. is to just "move" the files back. Doing a "revert" does NOT undo a "move". If you do "revert", your moved files will
  366. be removed from their new destination, and then you'll also need to follow the undelete instructions above to get them
  367. back into their original location.<br>
  368. <br>
  369. </p>
  370. <hr>
  371. <p>
  372. <a name="41"><h2>Merging</h2></a>
  373. </p>
  374. <p>
  375. Merging is not hard, it just takes practice. Hopefully, the GUI for doing merges with the SVN Plugin helps make it easier, but when in doubt, use the command line.
  376. </p>
  377. <p>
  378. The merge dialog lets you choose the source, revision(s) and destination for merging.
  379. </p>
  380. <p>
  381. <img src="merge_dialog.jpg">
  382. </p>
  383. <p>
  384. The merge dialog has these features:
  385. <ul>
  386. <li>Select source file or directory from either the local file system or the repository.</li>
  387. <li>Select a single revision or a revision range for the merge.</li>
  388. <li>The "to" range is synchronized with the "from" path and revision so it is easy to set up those "-c" style merges.</li>
  389. <li>Select destination directory from the local file system.</li>
  390. <li>"Dry run" and "Recursive" are selected by default since these are common choices.</li>
  391. <li>Show a preview of the equivalent svn command. This is great for verifying that the plugin is going to do the right thing.</li>
  392. </ul>
  393. </p>
  394. <p>
  395. Doing a "dry run" merge will show full merge output in the SVN Console. This will let you see all files that have conflicts, adds, deletes, merged, etc. This view is not interactive, since it is just a preview of what will happen in the merge.
  396. </p>
  397. <p>
  398. Doing an actual merge (dry run unchecked) will show the same output as a dry run merge, then will be followed by a Status on the working directory. This is the same status that is shown when doing a regular status, and has the same popup commands for resolving conflicts, diff, log, etc.
  399. </p>
  400. <p>
  401. <b>How to merge</b><br>
  402. This section is about how to merge using the SVN plugin. The tips provided here also apply to command-line svn. This is not an all-inclusive guide, nor does it cover all situations, but it does cover the most common use cases.
  403. </p>
  404. <br>
  405. <br>
  406. General tips:
  407. <ol>
  408. <li>Read the official Subversion documentation. It goes into great detail about merging and branching and is well worth reading.</li>
  409. <li>Always do merges locally. Check out the code branch to merge from and the code branch to merge to to your local machine.</li>
  410. <li>Make sure both branches for your merge are up to date.</li>
  411. <li>Before doing a switch, make sure your current branch is up to date and changes have been checked in. Files with uncommitted changes will not be switched, which can cause no end of problems.</li>
  412. <li>Always use explicit revision numbers for merging, avoid using HEAD. Doing merges locally (see #1) reduces the danger of using HEAD as a revision parameter. If you must merge from the repository, using HEAD is not necessarily safe since someone else could check in changes that you are not aware of and those changes can get lost.</li>
  413. <li>If you are working on a development branch that will eventually be merged back to trunk, do regular merges from trunk to your branch. Depending on the pace of your development team, you may need to merge daily, and probably not less than weekly. The more changes that are made, the more often you'll need to merge. It is much easier to a lot of small merges than one large merge.</li>
  414. <li>Keep a merge diary. You can keep it in a notebook, or a document checked into Subversion. Keep track of dates, revisions, and what branch was merged to where.</li>
  415. <li><b>Make good comments in your commits!</b> For example, "Merged from trunk at revision 1066", or "Merged from Widget branch from revision 102 to revision 151." This is especially critical when you are working on a development branch and need to regularly merge changes from trunk to your branch.</li>
  416. <li>You can find the revision that a branch was created at by running a log command on the branch. In the SVN Plugin, click on the branch in the SVN Browser, choose "Log" from the popup menu, check "Stop on copy", then show the log. In the Path column of the last log entry, you'll see something like <br><code>A /test3/branches/branch1 (from /test3/trunk revision 21)</code><br> The part in the parenthesis tells you exactly where the branch came from.</li>
  417. </ol>
  418. <br>
  419. <br>
  420. <b>Situation 1:</b> You fixed a bug in a single revision on a release branch and want to merge that change to trunk. This assumes you have the trunk already checked out locally. This diagram shows the situation:
  421. <br>
  422. <img src="merge_branch_to_trunk_1.jpg">
  423. <br>
  424. You want to merge the fix in revision 1034 to trunk. This revision may contain one or more files.
  425. <br>
  426. <br>
  427. Steps:
  428. <ol>
  429. <li>Open the merge dialog.</li>
  430. <li>In the "merge from" box, select the top level directory containing your branch code. The "To this path/revision" box will automatically fill in with the same path.</li>
  431. <li>In the top revision box, enter "1034" to specify the single revision you want to merge. The revision box in the "To this path/revision" will automatically fill with the same revision number.</li>
  432. <li>Select the directory containing the trunk code in the "working directory" box.</li>
  433. <li>Uncheck the "dry run" checkbox. (Or leave it checked and do a dry run first, which is always a good idea.)</li>
  434. <li>Click the "Show" button beside the command-line preview box. You should see:<br>
  435. <code>svn merge -c 1034 branch_directory trunk_directory</code></li>
  436. <li>Click the "Ok" button.</li>
  437. <li>Resolve any conflicts, build, run unit tests, etc, then commit.</li>
  438. </ol>
  439. <br>
  440. <br>
  441. <b>Situation 2:</b> You have been working on a development branch while others have been working on trunk. You want to merge the latest changes on trunk into your branch so you are working with the latest trunk code. This assumes you have both your working branch and trunk checked out locally. This diagram describes the situation:
  442. <br>
  443. <img src="trunk_to_dev_branch.jpg">
  444. <br>
  445. You previously merged from trunk to your dev branch at revision 2167 and currently head of trunk is revision 2182. You want to merge all changes on trunk from revision 2167 through 2182 to your development branch. This assumes you have both the trunk and your development branch checked out locally, and that both the trunk code and development branch code are up to date.
  446. <br>
  447. <br>
  448. Steps:
  449. <ol>
  450. <li>Open the merge dialog.</li>
  451. <li>In the "merge from" box, use the "Local" button to select the top level directory containing your trunk code. The "To this path/revision" box will automatically fill in with the same path.</li>
  452. <li>Enter "2167" in the top revision box.</li>
  453. <li>The revision box in the "To this path/revision" will automatically fill with the same revision number. Change it to "2182"</li>
  454. <li>Select the directory containing your development branch code in the "working directory" box.</li>
  455. <li>Uncheck the "dry run" checkbox. (Or leave it checked and do a dry run first, which is always a good idea.)</li>
  456. <li>Click the "Show" button beside the command-line preview box. You should see:<br>
  457. <code>svn merge -r 2167:2182 trunk_directory branch_directory</code></li>
  458. <li>Click the "Ok" button.</li>
  459. <li>Resolve any conflicts, build, run unit tests, etc, then commit from your development branch.</li>
  460. </ol>
  461. <br>
  462. <br>
  463. <b>Situation 3:</b> You have been working on a development branch while others have been working on trunk. You have completed work on the branch and are ready to merge your code to trunk. This assumes you have both your working branch and trunk checked out locally. This diagram describes the situation:
  464. <br>
  465. <img src="dev_branch_to_trunk.jpg">
  466. <br>
  467. The development branch was created from the trunk at revision 2149, and the current head of the branch is revision 2195. You want to merge your entire branch to trunk.
  468. <br>
  469. <br>
  470. Steps:
  471. <ol>
  472. <li>Open the merge dialog.</li>
  473. <li>In the "merge from" box, use the "Local" button to select the top level directory containing your development branch code. The "To this path/revision" box will automatically fill in with the same path.</li>
  474. <li>Enter "2149" in the top revision box.</li>
  475. <li>The revision box in the "To this path/revision" will automatically fill with the same revision number. Change it to "2195"</li>
  476. <li>Select the directory containing your trunk code in the "working directory" box.</li>
  477. <li>Uncheck the "dry run" checkbox. (Or leave it checked and do a dry run first, which is always a good idea.)</li>
  478. <li>Click the "Show" button beside the command-line preview box. You should see:<br>
  479. <code>svn merge -r 2149:2195 branch_directory trunk_directory</code></li>
  480. <li>Click the "Ok" button.</li>
  481. <li>Resolve any conflicts, build, run unit tests, etc, then commit your trunk code.</li>
  482. </ol>
  483. <b>Recovering from a bad merge:</b>
  484. <br>
  485. It happens. You pick the wrong directory, or merge the wrong way, or merge from the wrong revisions. Since you did everything locally and all your code was up to date from the repository, there is no harm done -- as long as you haven't committed yet. Just "Revert" your changes from your working directory. If you are not comfortable with that, you can also delete your "from" and "working" directories, check them both out from the repository, and do the merge again.
  486. <br>
  487. <br>
  488. If you have already committed your changes, you can do a "reverse merge":
  489. <ol>
  490. <li>Open the merge dialog.</li>
  491. <li>Select the top level of your working directory in the "merge from" box.</li>
  492. <li>Enter the revision that contained the bad merge, for example, 2196.</li>
  493. <li>In the "to path/revision", enter one revision less, continuing the example, enter 2195.</li>
  494. <li>Set the working directory to the same as the "merge from" box.</li>
  495. <li>Click the "Show" button beside the command-line preview box. You should see:<br>
  496. <code>svn merge -r 2196:2195 working_directory working_directory</code></li>
  497. <li>Click the "Ok" button.</li>
  498. <li>Resolve any conflicts, build, run unit tests, etc, then commit your trunk code.</li>
  499. </ol>
  500. <hr>
  501. <p>
  502. <a name="5"><h2>Bugtraq</h2></a>
  503. </p>
  504. <p>
  505. Bugtraq is a way to integrate Subversion with issue trackers. This plugin fully
  506. supports the Bugtraq standard.
  507. </p>
  508. <p>
  509. Bugtraq properties are set on folders, and the properties are applied to all files/directories
  510. under that folder. Typically, these properties are set on the "trunk" folder and folders within
  511. "branches". The SVNPlugin will check up the directory structure until the project root is
  512. reached and use any Bugtraq properties found. Note that if the Bugtraq properties are only
  513. set on "trunk" and users checkout a folder below that, they won't have access to the Bugtraq
  514. properties. You can apply the properties recursively in this case.
  515. </p>
  516. <p>
  517. <img src="bugtraq_properties.jpg">
  518. </p>
  519. <p>
  520. This image shows 6 of the 7 possible Bugtraq properties:
  521. <ul>
  522. <li>bugtraq:number -- if true, allows only numbers and commas to be entered into the bug entry field on the commit dialog.</li>
  523. <li>bugtraq:label -- this text is displayed in the commit dialog next to the bug entry field.</li>
  524. <li>bugtraq:warnifnoissue -- if true, this will cause the commit dialog to display a warning if the bug entry field is empty.</li>
  525. <li>bugtraq:message -- this text is added to the commit message with the bug id from the bug entry field included in the message.</li>
  526. <li>bugtraq:append -- if true, the bugtraq:message text is added at the end of the commit message, otherwise, it is inserted before the commit message.</li>
  527. <li>bugtraq:url -- this is used in the svn log display to link to a bug tracker. If there is a bug number in the log message, you can right click on the message
  528. and select "Open link in browser" to open a browser window with the contents of the appropriate issue tracker.</li>
  529. </ul>
  530. </p>
  531. <p>
  532. The property not shown above is "bugtraq:logregex".
  533. If two expressions are set, then the first expression is used to find a
  534. string which relates to a bug ID but may contain more than just the bug ID
  535. (e.g. "Issue #123" or "resolves issue 123").
  536. The second expression is then used to extract the bare bug ID from the string
  537. extracted with the first expression.
  538. An example:
  539. if you want to catch every pattern "issue #XXX" and "issue #890, #789" inside
  540. a log message you could use the following regex strings:<br>
  541. [Ii]ssue #?(\d+)(,? ?#?(\d+))+<br>
  542. (\d+)
  543. </p>
  544. <p>
  545. More details are available in the <a href="issuetrackers.html">Bugtraq specification</a>.<br>
  546. </p>
  547. <hr>
  548. <p>
  549. <a name="50"><h2>Licenses</h2></a>
  550. </p>
  551. <p>
  552. <b>SVN Plugin</b><br>
  553. <br>
  554. The SVNPlugin is licensed as follows:
  555. <pre>
  556. Copyright (c) 2007, Dale Anson
  557. All rights reserved.
  558. Redistribution and use in source and binary forms, with or without modification,
  559. are permitted provided that the following conditions are met:
  560. * Redistributions of source code must retain the above copyright notice,
  561. this list of conditions and the following disclaimer.
  562. * Redistributions in binary form must reproduce the above copyright notice,
  563. this list of conditions and the following disclaimer in the documentation
  564. and/or other materials provided with the distribution.
  565. * Neither the name of the author nor the names of its contributors
  566. may be used to endorse or promote products derived from this software without
  567. specific prior written permission.
  568. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  569. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  570. WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  571. DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
  572. ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  573. (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  574. LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  575. ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  576. (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  577. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  578. </pre>
  579. </p>
  580. <p>
  581. <b>SVNKit Library</b><br>
  582. <br>
  583. This plugin uses the SVNKit library (www.svnkit.com) from TMate Software, which has this license:
  584. <pre>
  585. The TMate License
  586. This license applies to all portions of TMate SVNKit library, which
  587. are not externally-maintained libraries (e.g. Ganymed SSH library).
  588. All the source code and compiled classes in package org.tigris.subversion.javahl
  589. except SvnClient class are covered by the license in JAVAHL-LICENSE file
  590. Copyright (c) 2004-2007 TMate Software. All rights reserved.
  591. Redistribution and use in source and binary forms, with or without modification,
  592. are permitted provided that the following conditions are met:
  593. * Redistributions of source code must retain the above copyright notice,
  594. this list of conditions and the following disclaimer.
  595. * Redistributions in binary form must reproduce the above copyright notice,
  596. this list of conditions and the following disclaimer in the documentation
  597. and/or other materials provided with the distribution.
  598. * Redistributions in any form must be accompanied by information on how to
  599. obtain complete source code for the software that uses SVNKit and any
  600. accompanying software that uses the software that uses SVNKit. The source
  601. code must either be included in the distribution or be available for no
  602. more than the cost of distribution plus a nominal fee, and must be freely
  603. redistributable under reasonable conditions. For an executable file, complete
  604. source code means the source code for all modules it contains. It does not
  605. include source code for modules or files that typically accompany the major
  606. components of the operating system on which the executable file runs.
  607. * Redistribution in any form without redistributing source code for software
  608. that uses SVNKit is possible only when such redistribution is explictly permitted
  609. by TMate Software. Please, contact TMate Software at support@svnkit.com to
  610. get such permission.
  611. THIS SOFTWARE IS PROVIDED BY TMATE SOFTWARE ``AS IS'' AND ANY EXPRESS OR IMPLIED
  612. WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  613. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE
  614. DISCLAIMED.
  615. IN NO EVENT SHALL TMATE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
  616. INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  617. LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  618. PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
  619. LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  620. OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  621. ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  622. </pre>
  623. </p>
  624. <p>
  625. <b>Date Selector Utility</b><br>
  626. <br>
  627. This plugin uses the Date Selector Utility as published in the July 2003
  628. issue of JavaWorld:<br>
  629. <br>
  630. This program contains Allen Holub's Date Selector utility.
  631. (c) 2003 Allen I. Holub. All Rights Reserved.
  632. </p>
  633. <p>
  634. <b>SwingWorker</b><br>
  635. <br>
  636. This plugin also uses the original SwingWorker library, which is licensed as follows.
  637. Once Java 1.6 becomes more widespread, I'll replace this library with the SwingWorker
  638. classes distributed with Java itself.
  639. <pre>
  640. Copyright (c) 2005 Sun Microsystems, Inc., 4150 Network Circle, Santa
  641. Clara, California 95054, U.S.A. All rights reserved. Use is subject
  642. to license terms below. Sun, Sun Microsystems and the Sun logo are
  643. trademarks or registered trademarks of Sun Microsystems, Inc. in the
  644. U.S. and other countries.
  645. Notice: This product is covered by U.S. export control laws and may be
  646. subject to the export or import laws in other countries. These laws may
  647. restrict the fields of use for this software and may require you to
  648. secure government authorization.
  649. GNU LESSER GENERAL PUBLIC LICENSE
  650. Version 2.1, February 1999
  651. Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  652. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  653. Everyone is permitted to copy and distribute verbatim copies
  654. of this license document, but changing it is not allowed.
  655. [This is the first released version of the Lesser GPL. It also counts
  656. as the successor of the GNU Library Public License, version 2, hence
  657. the version number 2.1.]
  658. Preamble
  659. The licenses for most software are designed to take away your
  660. freedom to share and change it. By contrast, the GNU General Public
  661. Licenses are intended to guarantee your freedom to share and change
  662. free software--to make sure the software is free for all its users.
  663. This license, the Lesser General Public License, applies to some
  664. specially designated software packages--typically libraries--of the
  665. Free Software Foundation and other authors who decide to use it. You
  666. can use it too, but we suggest you first think carefully about whether
  667. this license or the ordinary General Public License is the better
  668. strategy to use in any particular case, based on the explanations below.
  669. When we speak of free software, we are referring to freedom of use,
  670. not price. Our General Public Licenses are designed to make sure that
  671. you have the freedom to distribute copies of free software (and charge
  672. for this service if you wish); that you receive source code or can get
  673. it if you want it; that you can change the software and use pieces of
  674. it in new free programs; and that you are informed that you can do
  675. these things.
  676. To protect your rights, we need to make restrictions that forbid
  677. distributors to deny you these rights or to ask you to surrender these
  678. rights. These restrictions translate to certain responsibilities for
  679. you if you distribute copies of the library or if you modify it.
  680. For example, if you distribute copies of the library, whether gratis
  681. or for a fee, you must give the recipients all the rights that we gave
  682. you. You must make sure that they, too, receive or can get the source
  683. code. If you link other code with the library, you must provide
  684. complete object files to the recipients, so that they can relink them
  685. with the library after making changes to the library and recompiling
  686. it. And you must show them these terms so they know their rights.
  687. We protect your rights with a two-step method: (1) we copyright the
  688. library, and (2) we offer you this license, which gives you legal
  689. permission to copy, distribute and/or modify the library.
  690. To protect each distributor, we want to make it very clear that
  691. there is no warranty for the free library. Also, if the library is
  692. modified by someone else and passed on, the recipients should know
  693. that what they have is not the original version, so that the original
  694. author's reputation will not be affected by problems that might be
  695. introduced by others.
  696. Finally, software patents pose a constant threat to the existence of
  697. any free program. We wish to make sure that a company cannot
  698. effectively restrict the users of a free program by obtaining a
  699. restrictive license from a patent holder. Therefore, we insist that
  700. any patent license obtained for a version of the library must be
  701. consistent with the full freedom of use specified in this license.
  702. Most GNU software, including some libraries, is covered by the
  703. ordinary GNU General Public License. This license, the GNU Lesser
  704. General Public License, applies to certain designated libraries, and
  705. is quite different from the ordinary General Public License. We use
  706. this license for certain libraries in order to permit linking those
  707. libraries into non-free programs.
  708. When a program is linked with a library, whether statically or using
  709. a shared library, the combination of the two is legally speaking a
  710. combined work, a derivative of the original library. The ordinary
  711. General Public License therefore permits such linking only if the
  712. entire combination fits its criteria of freedom. The Lesser General
  713. Public License permits more lax criteria for linking other code with
  714. the library.
  715. We call this license the "Lesser" General Public License because it
  716. does Less to protect the user's freedom than the ordinary General
  717. Public License. It also provides other free software developers Less
  718. of an advantage over competing non-free programs. These disadvantages
  719. are the reason we use the ordinary General Public License for many
  720. libraries. However, the Lesser license provides advantages in certain
  721. special circumstances.
  722. For example, on rare occasions, there may be a special need to
  723. encourage the widest possible use of a certain library, so that it becomes
  724. a de-facto standard. To achieve this, non-free programs must be
  725. allowed to use the library. A more frequent case is that a free
  726. library does the same job as widely used non-free libraries. In this
  727. case, there is little to gain by limiting the free library to free
  728. software only, so we use the Lesser General Public License.
  729. In other cases, permission to use a particular library in non-free
  730. programs enables a greater number of people to use a large body of
  731. free software. For example, permission to use the GNU C Library in
  732. non-free programs enables many more people to use the whole GNU
  733. operating system, as well as its variant, the GNU/Linux operating
  734. system.
  735. Although the Lesser General Public License is Less protective of the
  736. users' freedom, it does ensure that the user of a program that is
  737. linked with the Library has the freedom and the wherewithal to run
  738. that program using a modified version of the Library.
  739. The precise terms and conditions for copying, distribution and
  740. modification follow. Pay close attention to the difference between a
  741. "work based on the library" and a "work that uses the library". The
  742. former contains code derived from the library, whereas the latter must
  743. be combined with the library in order to run.
  744. GNU LESSER GENERAL PUBLIC LICENSE
  745. TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  746. 0. This License Agreement applies to any software library or other
  747. program which contains a notice placed by the copyright holder or
  748. other authorized party saying it may be distributed under the terms of
  749. this Lesser General Public License (also called "this License").
  750. Each licensee is addressed as "you".
  751. A "library" means a collection of software functions and/or data
  752. prepared so as to be conveniently linked with application programs
  753. (which use some of those functions and data) to form executables.
  754. The "Library", below, refers to any such software library or work
  755. which has been distributed under these terms. A "work based on the
  756. Library" means either the Library or any derivative work under
  757. copyright law: that is to say, a work containing the Library or a
  758. portion of it, either verbatim or with modifications and/or translated
  759. straightforwardly into another language. (Hereinafter, translation is
  760. included without limitation in the term "modification".)
  761. "Source code" for a work means the preferred form of the work for
  762. making modifications to it. For a library, complete source code means
  763. all the source code for all modules it contains, plus any associated
  764. interface definition files, plus the scripts used to control compilation
  765. and installation of the library.
  766. Activities other than copying, distribution and modification are not
  767. covered by this License; they are outside its scope. The act of
  768. running a program using the Library is not restricted, and output from
  769. such a program is covered only if its contents constitute a work based
  770. on the Library (independent of the use of the Library in a tool for
  771. writing it). Whether that is true depends on what the Library does
  772. and what the program that uses the Library does.
  773. 1. You may copy and distribute verbatim copies of the Library's
  774. complete source code as you receive it, in any medium, provided that
  775. you conspicuously and appropriately publish on each copy an
  776. appropriate copyright notice and disclaimer of warranty; keep intact
  777. all the notices that refer to this License and to the absence of any
  778. warranty; and distribute a copy of this License along with the
  779. Library.
  780. You may charge a fee for the physical act of transferring a copy,
  781. and you may at your option offer warranty protection in exchange for a
  782. fee.
  783. 2. You may modify your copy or copies of the Library or any portion
  784. of it, thus forming a work based on the Library, and copy and
  785. distribute such modifications or work under the terms of Section 1
  786. above, provided that you also meet all of these conditions:
  787. a) The modified work must itself be a software library.
  788. b) You must cause the files modified to carry prominent notices
  789. stating that you changed the files and the date of any change.
  790. c) You must cause the whole of the work to be licensed at no
  791. charge to all third parties under the terms of this License.
  792. d) If a facility in the modified Library refers to a function or a
  793. table of data to be supplied by an application program that uses
  794. the facility, other than as an argument passed when the facility
  795. is invoked, then you must make a good faith effort to ensure that,
  796. in the event an application does not supply such function or
  797. table, the facility still operates, and performs whatever part of
  798. its purpose remains meaningful.
  799. (For example, a function in a library to compute square roots has
  800. a purpose that is entirely well-defined independent of the
  801. application. Therefore, Subsection 2d requires that any
  802. application-supplied function or table used by this function must
  803. be optional: if the application does not supply it, the square
  804. root function must still compute square roots.)
  805. These requirements apply to the modified work as a whole. If
  806. identifiable sections of that work are not derived from the Library,
  807. and can be reasonably considered independent and separate works in
  808. themselves, then this License, and its terms, do not apply to those
  809. sections when you distribute them as separate works. But when you
  810. distribute the same sections as part of a whole which is a work based
  811. on the Library, the distribution of the whole must be on the terms of
  812. this License, whose permissions for other licensees extend to the
  813. entire whole, and thus to each and every part regardless of who wrote
  814. it.
  815. Thus, it is not the intent of this section to claim rights or contest
  816. your rights to work written entirely by you; rather, the intent is to
  817. exercise the right to control the distribution of derivative or
  818. collective works based on the Library.
  819. In addition, mere aggregation of another work not based on the Library
  820. with the Library (or with a work based on the Library) on a volume of
  821. a storage or distribution medium does not bring the other work under
  822. the scope of this License.
  823. 3. You may opt to apply the terms of the ordinary GNU General Public
  824. License instead of this License to a given copy of the Library. To do
  825. this, you must alter all the notices that refer to this License, so
  826. that they refer to the ordinary GNU General Public License, version 2,
  827. instead of to this License. (If a newer version than version 2 of the
  828. ordinary GNU General Public License has appeared, then you can specify
  829. that version instead if you wish.) Do not make any other change in
  830. these notices.
  831. Once this change is made in a given copy, it is irreversible for
  832. that copy, so the ordinary GNU General Public License applies to all
  833. subsequent copies and derivative works made from that copy.
  834. This option is useful when you wish to copy part of the code of
  835. the Library into a program that is not a library.
  836. 4. You may copy and distribute the Library (or a portion or
  837. derivative of it, under Section 2) in object code or executable form
  838. under the terms of Sections 1 and 2 above provided that you accompany
  839. it with the complete corresponding machine-readable source code, which
  840. must be distributed under the terms of Sections 1 and 2 above on a
  841. medium customarily used for software interchange.
  842. If distribution of object code is made by offering access to copy
  843. from a designated place, then offering equivalent access to copy the
  844. source code from the same place satisfies the requirement to
  845. distribute the source code, even though third parties are not
  846. compelled to copy the source along with the object code.
  847. 5. A program that contains no derivative of any portion of the
  848. Library, but is designed to work with the Library by being compiled or
  849. linked with it, is called a "work that uses the Library". Such a
  850. work, in isolation, is not a derivative work of the Library, and
  851. therefore falls outside the scope of this License.
  852. However, linking a "work that uses the Library" with the Library
  853. creates an executable that is a derivative of the Library (because it
  854. contains portions of the Library), rather than a "work that uses the
  855. library". The executable is therefore covered by this License.
  856. Section 6 states terms for distribution of such executables.
  857. When a "work that uses the Library" uses material from a header file
  858. that is part of the Library, the object code for the work may be a
  859. derivative work of the Library even though the source code is not.
  860. Whether this is true is especially significant if the work can be
  861. linked without the Library, or if the work is itself a library. The
  862. threshold for this to be true is not precisely defined by law.
  863. If such an object file uses only numerical parameters, data
  864. structure layouts and accessors, and small macros and small inline
  865. functions (ten lines or less in length), then the use of the object
  866. file is unrestricted, regardless of whether it is legally a derivative
  867. work. (Executables containing this object code plus portions of the
  868. Library will still fall under Section 6.)
  869. Otherwise, if the work is a derivative of the Library, you may
  870. distribute the object code for the work under the terms of Section 6.
  871. Any executables containing that work also fall under Section 6,
  872. whether or not they are linked directly with the Library itself.
  873. 6. As an exception to the Sections above, you may also combine or
  874. link a "work that uses the Library" with the Library to produce a
  875. work containing portions of the Library, and distribute that work
  876. under terms of your choice, provided that the terms permit
  877. modification of the work for the customer's own use and reverse
  878. engineering for debugging such modifications.
  879. You must give prominent notice with each copy of the work that the
  880. Library is used in it and that the Library and its use are covered by
  881. this License. You must supply a copy of this License. If the work
  882. during execution displays copyright notices, you must include the
  883. copyright notice for the Library among them, as well as a reference
  884. directing the user to the copy of this License. Also, you must do one
  885. of these things:
  886. a) Accompany the work with the complete corresponding
  887. machine-readable source code for the Library including whatever
  888. changes were used in the work (which must be distributed under
  889. Sections 1 and 2 above); and, if the work is an executable linked
  890. with the Library, with the complete machine-readable "work that
  891. uses the Library", as object code and/or source code, so that the
  892. user can modify the Library and then relink to produce a modified
  893. executable containing the modified Library. (It is understood
  894. that the user who changes the contents of definitions files in the
  895. Library will not necessarily be able to recompile the application
  896. to use the modified definitions.)
  897. b) Use a suitable shared library mechanism for linking with the
  898. Library. A suitable mechanism is one that (1) uses at run time a
  899. copy of the library already present on the user's computer system,
  900. rather than copying library functions into the executable, and (2)
  901. will operate properly with a modified version of the library, if
  902. the user installs one, as long as the modified version is
  903. interface-compatible with the version that the work was made with.
  904. c) Accompany the work with a written offer, valid for at
  905. least three years, to give the same user the materials
  906. specified in Subsection 6a, above, for a charge no more
  907. than the cost of performing this distribution.
  908. d) If distribution of the work is made by offering access to copy
  909. from a designated place, offer equivalent access to copy the above
  910. specified materials from the same place.
  911. e) Verify that the user has already received a copy of these
  912. materials or that you have already sent this user a copy.
  913. For an executable, the required form of the "work that uses the
  914. Library" must include any data and utility programs needed for
  915. reproducing the executable from it. However, as a special exception,
  916. the materials to be distributed need not include anything that is
  917. normally distributed (in either source or binary form) with the major
  918. components (compiler, kernel, and so on) of the operating system on
  919. which the executable runs, unless that component itself accompanies
  920. the executable.
  921. It may happen that this requirement contradicts the license
  922. restrictions of other proprietary libraries that do not normally
  923. accompany the operating system. Such a contradiction means you cannot
  924. use both them and the Library together in an executable that you
  925. distribute.
  926. 7. You may place library facilities that are a work based on the
  927. Library side-by-side in a single library together with other library
  928. facilities not covered by this License, and distribute such a combined
  929. library, provided that the separate distribution of the work based on
  930. the Library and of the other library facilities is otherwise
  931. permitted, and provided that you do these two things:
  932. a) Accompany the combined library with a copy of the same work
  933. based on the Library, uncombined with any other library
  934. facilities. This must be distributed under the terms of the
  935. Sections above.
  936. b) Give prominent notice with the combined library of the fact
  937. that part of it is a work based on the Library, and explaining
  938. where to find the accompanying uncombined form of the same work.
  939. 8. You may not copy, modify, sublicense, link with, or distribute
  940. the Library except as expressly provided under this License. Any
  941. attempt otherwise to copy, modify, sublicense, link with, or
  942. distribute the Library is void, and will automatically terminate your
  943. rights under this License. However, parties who have received copies,
  944. or rights, from you under this License will not have their licenses
  945. terminated so long as such parties remain in full compliance.
  946. 9. You are not required to accept this License, since you have not
  947. signed it. However, nothing else grants you permission to modify or
  948. distribute the Library or its derivative works. These actions are
  949. prohibited by law if you do not accept this License. Therefore, by
  950. modifying or distributing the Library (or any work based on the
  951. Library), you indicate your acceptance of this License to do so, and
  952. all its terms and conditions for copying, distributing or modifying
  953. the Library or works based on it.
  954. 10. Each time you redistribute the Library (or any work based on the
  955. Library), the recipient automatically receives a license from the
  956. original licensor to copy, distribute, link with or modify the Library
  957. subject to these terms and conditions. You may not impose any further
  958. restrictions on the recipients' exercise of the rights granted herein.
  959. You are not responsible for enforcing compliance by third parties with
  960. this License.
  961. 11. If, as a consequence of a court judgment or allegation of patent
  962. infringement or for any other reason (not limited to patent issues),
  963. conditions are imposed on you (whether by court order, agreement or
  964. otherwise) that contradict the conditions of this License, they do not
  965. excuse you from the conditions of this License. If you cannot
  966. distribute so as to satisfy simultaneously your obligations under this
  967. License and any other pertinent obligations, then as a consequence you
  968. may not distribute the Library at all. For example, if a patent
  969. license would not permit royalty-free redistribution of the Library by
  970. all those who receive copies directly or indirectly through you, then
  971. the only way you could satisfy both it and this License would be to
  972. refrain entirely from distribution of the Library.
  973. If any portion of this section is held invalid or unenforceable under any
  974. particular circumstance, the balance of the section is intended to apply,
  975. and the section as a whole is intended to apply in other circumstances.
  976. It is not the purpose of this section to induce you to infringe any
  977. patents or other property right claims or to contest validity of any
  978. such claims; this section has the sole purpose of protecting the
  979. integrity of the free software distribution system which is
  980. implemented by public license practices. Many people have made
  981. generous contributions to the wide range of software distributed
  982. through that system in reliance on consistent application of that
  983. system; it is up to the author/donor to decide if he or she is willing
  984. to distribute software through any other system and a licensee cannot
  985. impose that choice.
  986. This section is intended to make thoroughly clear what is believed to
  987. be a consequence of the rest of this License.
  988. 12. If the distribution and/or use of the Library is restricted in
  989. certain countries either by patents or by copyrighted interfaces, the
  990. original copyright holder who places the Library under this License may add
  991. an explicit geographical distribution limitation excluding those countries,
  992. so that distribution is permitted only in or among countries not thus
  993. excluded. In such case, this License incorporates the limitation as if
  994. written in the body of this License.
  995. 13. The Free Software Foundation may publish revised and/or new
  996. versions of the Lesser General Public License from time to time.
  997. Such new versions will be similar in spirit to the present version,
  998. but may differ in detail to address new problems or concerns.
  999. Each version is given a distinguishing version number. If the Library
  1000. specifies a version number of this License which applies to it and
  1001. "any later version", you have the option of following the terms and
  1002. conditions either of that version or of any later version published by
  1003. the Free Software Foundation. If the Library does not specify a
  1004. license version number, you may choose any version ever published by
  1005. the Free Software Foundation.
  1006. 14. If you wish to incorporate parts of the Library into other free
  1007. programs whose distribution conditions are incompatible with these,
  1008. write to the author to ask for permission. For software which is
  1009. copyrighted by the Free Software Foundation, write to the Free
  1010. Software Foundation; we sometimes make exceptions for this. Our
  1011. decision will be guided by the two goals of preserving the free status
  1012. of all derivatives of our free software and of promoting the sharing
  1013. and reuse of software generally.
  1014. NO WARRANTY
  1015. 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
  1016. WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
  1017. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
  1018. OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
  1019. KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
  1020. IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  1021. PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
  1022. LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
  1023. THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  1024. 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
  1025. WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
  1026. AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
  1027. FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
  1028. CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
  1029. LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
  1030. RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
  1031. FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
  1032. SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
  1033. DAMAGES.
  1034. END OF TERMS AND CONDITIONS
  1035. </pre>
  1036. </p>
  1037. </body>
  1038. </html>