• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision6837 (tree)
Zeit2006-06-17 21:51:38
Autorstefankueng

Log Message

Add separate pages for TortoiseMerge, TortoiseIDiff and TortoiseBlame.

Ändern Zusammenfassung

Diff

--- trunk/www/TortoiseIDiff.html (nonexistent)
+++ trunk/www/TortoiseIDiff.html (revision 6837)
@@ -0,0 +1,43 @@
1+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3+<html xmlns="http://www.w3.org/1999/xhtml">
4+<head>
5+
6+<style type="text/css"> /* <![CDATA[ */
7+ @import "/branding/css/tigris.css";
8+ @import "/branding/css/inst.css";
9+ /* ]]> */</style>
10+<link rel="stylesheet" type="text/css" media="print"
11+ href="/branding/css/print.css"/>
12+<script type="text/javascript" src="/branding/scripts/tigris.js"></script>
13+<title>TortoiseIDiff - See changes in image files</title>
14+
15+</head>
16+
17+<body>
18+
19+<!-- The class h2 is included on the main div, because the HTML which the
20+ server will wrap around the page includes a <div class="h2">.
21+ Thus, we include one here so that the page looks right when previewed
22+ locally, *but* we override the border which the CSS assigns to that
23+ style, so that we do not get two borders on the live page. -->
24+<div class="h2 app" id="customcontent">
25+
26+ <h2>TortoiseIDiff</h2>
27+ <p>
28+ Depending on your project, not all files which are under version
29+ control are text files. Most likely you will have images too, for
30+ example screenshots and diagrams for the documentation/helpfile.
31+ </p>
32+ <p>
33+ For those files it's not possible to use a common file diff tool,
34+ because they only work with text files and diff line-by-line.
35+ Here is where the Tortoise Image Diff tool (TortoiseIDiff) comes
36+ to the rescue. It can show two images side-by-side, or even
37+ show the images over each other alpha blended.
38+ </p>
39+ <img alt="TortoiseIDiff with images side-by-side" src="images/TortoiseIDiffTwo.png">
40+ <img alt="TortoiseIDiff with images alpha-blended" src="images/TortoiseIDiffOne.png">
41+
42+</div>
43+</body>
\ No newline at end of file
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
--- trunk/www/TortoiseMerge.html (nonexistent)
+++ trunk/www/TortoiseMerge.html (revision 6837)
@@ -0,0 +1,98 @@
1+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3+<html xmlns="http://www.w3.org/1999/xhtml">
4+<head>
5+
6+<style type="text/css"> /* <![CDATA[ */
7+ @import "/branding/css/tigris.css";
8+ @import "/branding/css/inst.css";
9+ /* ]]> */</style>
10+<link rel="stylesheet" type="text/css" media="print"
11+ href="/branding/css/print.css"/>
12+<script type="text/javascript" src="/branding/scripts/tigris.js"></script>
13+<title>TortoiseMerge - a text diff tool</title>
14+
15+</head>
16+
17+<body>
18+
19+<!-- The class h2 is included on the main div, because the HTML which the
20+ server will wrap around the page includes a <div class="h2">.
21+ Thus, we include one here so that the page looks right when previewed
22+ locally, *but* we override the border which the CSS assigns to that
23+ style, so that we do not get two borders on the live page. -->
24+<div class="h2 app" id="customcontent">
25+
26+ <a name="intro">
27+ <h2>TortoiseMerge</h2>
28+ <p>
29+ Version control is all about having the history of your working progress.
30+ But to really see and check the history, you must be able to see and check
31+ what has changed between two points in time, for example what has changed
32+ between two releases of your product, or what was changed to fix a bug, or ...
33+ </p>
34+
35+ <a name="diff">
36+ <h3>Diffing files</h3>
37+ <p>
38+ At least for files which consist of text, TortoiseMerge can help you here.
39+ It shows you the two versions of a file side-by-side, coloring every
40+ modified line in that file.
41+ </p>
42+ <img alt="TortoiseMerge showing two file diff" src="images/TMerge2Diff.png">
43+ <p>
44+ You can see in that screenshot that TortoiseMerge also colors the changes
45+ <em>inside</em> modified lines so you can see immediately what exactly
46+ has changed.
47+ </p>
48+ <p>
49+ When you reformat your code or text, sometimes you don't really change
50+ anything but only split a long line into multiple ones, or you merge
51+ multiple lines into one. TortoiseMerge marks such changes with a white
52+ circle on the left gray bar of each view. If you see such a white
53+ circle, you know that no real changes were made, only changes in
54+ <em>whitespaces</em>.
55+ </p>
56+ <p>
57+ At the bottom of the window, there is a view showing the two lines your
58+ mouse pointer is currently hovering over. It always shows whitespace characters
59+ with special chars, and of course it's very handy if you have long lines
60+ because that view has the double width than the normal views.
61+ </p>
62+
63+ <a name="merge">
64+ <h3>Resolving conflicts</h3>
65+ <p>
66+ But that's not all TortoiseMerge is able to do for you. It can also help
67+ you resolve a conflict by showing you <em>your</em> file, the file which
68+ has been modified by <em>someone else</em> and the file as it was before
69+ any of you have modified it, in its <em>original</em> state. Then you can
70+ easily see where the changes made conflict, and you can choose how to
71+ resolve that conflict.
72+ </p>
73+ <img alt="TortoiseMerge showing two file diff" src="images/TMerge3Diff.png">
74+
75+ <a name="patch">
76+ <h3>Applying patch files</h3>
77+ <p>
78+ When you're working on a project and other people have access to your
79+ sourcecode, but not necessarily have the rights to commit changes to
80+ the repository, you sometimes get a patch file with a bug fix or an
81+ enhancement. TortoiseMerge helps here too, because it can apply those
82+ patchfiles for you.
83+ </p>
84+ <img alt="Context menu to apply a patch" src="images/ApplyPatchMenu.png">
85+ <br />
86+ <img alt="TortoiseMerge in Apply-Patch mode" src="images/ApplyPatch.png">
87+ <p>
88+ On the left is a small window containing all files which the patchfile
89+ wants to modify. A doubleclick on those file entries opens the file
90+ to be patched on the left, and the file how it looks like after the
91+ patch is applied on the right side.
92+ </p>
93+ <p>
94+ To approve the patch, saving the file is enough.
95+ </p>
96+
97+</div>
98+</body>
\ No newline at end of file
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
--- trunk/www/blame.html (nonexistent)
+++ trunk/www/blame.html (revision 6837)
@@ -0,0 +1,53 @@
1+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3+<html xmlns="http://www.w3.org/1999/xhtml">
4+<head>
5+
6+<style type="text/css"> /* <![CDATA[ */
7+ @import "/branding/css/tigris.css";
8+ @import "/branding/css/inst.css";
9+ /* ]]> */</style>
10+<link rel="stylesheet" type="text/css" media="print"
11+ href="/branding/css/print.css"/>
12+<script type="text/javascript" src="/branding/scripts/tigris.js"></script>
13+<title>TortoiseBlame - who changed which line, when and why?</title>
14+
15+</head>
16+
17+<body>
18+
19+<!-- The class h2 is included on the main div, because the HTML which the
20+ server will wrap around the page includes a <div class="h2">.
21+ Thus, we include one here so that the page looks right when previewed
22+ locally, *but* we override the border which the CSS assigns to that
23+ style, so that we do not get two borders on the live page. -->
24+<div class="h2 app" id="customcontent">
25+ <a name="intro">
26+ <h2>TortoiseBlame</h2>
27+ <p>
28+ Sometimes you need to know why a part of your files is the way it
29+ is, who made that particular change and why. Or in other words:
30+ "Who the h*** put that command there?".
31+ </p>
32+ <p>
33+ Subversion has a command for this, and it is called <em>blame</em>
34+ (guess why). Subversion creates a blame of a file by adding information
35+ about the author who committed a line, the revision the line was last
36+ changed and the date.
37+ </p>
38+ <p>
39+ TortoiseSVN has its own tool to show you those blames. In addition to
40+ the information other Subversion clients show, it also shows you
41+ the log message of the commit for each line inside a little tooltip
42+ window when you hover the mousepointer over a line.
43+ </p>
44+ <img alt="TortoiseBlame" src="images/Blame.png">
45+ <p>
46+ To make it easier to follow a specific revision (which lines exactly
47+ were changed in a commit), it colors lines from the same revision
48+ differently. Also a separate color is used for the author of the
49+ currently selected line.
50+ </p>
51+
52+</div>
53+</body>
\ No newline at end of file
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
--- trunk/www/index.html (revision 6836)
+++ trunk/www/index.html (revision 6837)
@@ -105,14 +105,14 @@
105105 </ul>
106106 <li>Helpful Tools</li>
107107 <ul>
108- <li>TortoiseMerge</li>
108+ <li><a href="/TortoiseMerge.html">TortoiseMerge</a></li>
109109 <ul>
110- <li>Shows changes you made to your files</li>
111- <li>Helps resolving conflicts</li>
112- <li>Can apply patchfiles you got from users without commit access to your repository</li>
110+ <li>Shows <a href="/TortoiseMerge.html#diff">changes</a> you made to your files</li>
111+ <li>Helps <a href="/TortoiseMerge.html#merge">resolving conflicts</a></li>
112+ <li>Can <a href="/TortoiseMerge.html#patch">apply patchfiles</a> you got from users without commit access to your repository</li>
113113 </ul>
114- <li>TortoiseBlame: to show blames of files. Shows also log messages for each line in a file.</li>
115- <li>TortoiseIDiff: to see the changes you made to your image files [<a href="#version14">*</a>]</li>
114+ <li><a href="/blame.html">TortoiseBlame</a>: to show blames of files. Shows also log messages for each line in a file.</li>
115+ <li><a href="/TortoiseIDiff.html">TortoiseIDiff</a>: to see the changes you made to your image files [<a href="#version14">*</a>]</li>
116116 <li>SubWCRev: to include the revision numbers/dates/... into your source files</li>
117117 </ul>
118118 <li>Available in many languages</li>
Show on old repository browser