3 "Project-Id-Version: PACKAGE VERSION\n"
\r
4 "POT-Creation-Date: 2009-02-04 22:58 +0000\n"
\r
5 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
\r
6 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
\r
7 "Language-Team: LANGUAGE <LL@li.org>\n"
\r
8 "MIME-Version: 1.0\n"
\r
9 "Content-Type: text/plain; charset=UTF-8\n"
\r
10 "Content-Transfer-Encoding: 8bit\n"
\r
12 #. When image changes, this message will be marked fuzzy or untranslated for you.
\r
13 #. It doesn't matter what you translate it to: it's not used at all.
\r
14 #: ../source/TortoiseGit_en.xml:13699
\r
16 msgid "@@image: 'images/svn_move.png'; md5=THIS FILE DOESN'T EXIST"
\r
19 #: ../source/TortoiseGit_en.xml:4
\r
21 #: ../source/TortoiseGit_en.xml:3022
\r
26 #: ../source/TortoiseGit_en.xml:5
\r
28 msgid "A Git client for Windows"
\r
31 #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated
\r
32 #: ../source/TortoiseGit_en.xml:6
\r
34 msgid "Version $MajorVersion$.$MinorVersion$.$MicroVersion$"
\r
37 #: ../source/TortoiseGit_en.xml:8
\r
42 #: ../source/TortoiseGit_en.xml:11
\r
47 #: ../source/TortoiseGit_en.xml:12
\r
52 #: ../source/TortoiseGit_en.xml:15
\r
57 #: ../source/TortoiseGit_en.xml:16
\r
62 #: ../source/TortoiseGit_en.xml:19
\r
67 #: ../source/TortoiseGit_en.xml:20
\r
72 #: ../source/TortoiseGit_en.xml:27
\r
77 #: ../source/TortoiseGit_en.xml:35
\r
79 msgid "Do you work in a team?"
\r
82 #: ../source/TortoiseGit_en.xml:40
\r
84 msgid "Has it ever happened that you were working on a file, and someone else was working on the same file at the same time? Did you lose your changes to that file because of that?"
\r
87 #: ../source/TortoiseGit_en.xml:47
\r
89 msgid "Have you ever saved a file, and then wanted to revert the changes you made? Have you ever wished you could see what a file looked like some time ago?"
\r
92 #: ../source/TortoiseGit_en.xml:54
\r
94 msgid "Have you ever found a bug in your project and wanted to know when that bug got into your files?"
\r
97 #: ../source/TortoiseGit_en.xml:61
\r
99 msgid "If you answered <quote>yes</quote> to one of these questions, then TortoiseGit is for you! Just read on to find out how TortoiseGit can help you in your work. It's not that difficult."
\r
102 #: ../source/TortoiseGit_en.xml:71
\r
107 #: ../source/TortoiseGit_en.xml:72
\r
109 msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it."
\r
112 #: ../source/TortoiseGit_en.xml:84
\r
114 msgid "Reading Guide"
\r
117 #: ../source/TortoiseGit_en.xml:85
\r
119 msgid "This <xref linkend=\"tsvn-preface\"/> explains a little about the TortoiseGit project, the community of people who work on it, and the licensing conditions for using it and distributing it."
\r
122 #: ../source/TortoiseGit_en.xml:90
\r
124 msgid "The <xref linkend=\"tsvn-introduction\"/> explains what TortoiseGit is, what it does, where it comes from and the basics for installing it on your PC."
\r
127 #: ../source/TortoiseGit_en.xml:95
\r
129 msgid "In <xref linkend=\"tsvn-basics\"/> we give a short introduction to the <emphasis>Git</emphasis> revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works."
\r
132 #: ../source/TortoiseGit_en.xml:102
\r
134 msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators."
\r
137 #: ../source/TortoiseGit_en.xml:107
\r
139 msgid "The chapter on <xref linkend=\"tsvn-repository\"/> explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server."
\r
142 #: ../source/TortoiseGit_en.xml:113
\r
144 msgid "The <xref linkend=\"tsvn-dug\"/> is the most important section as it explains all the main features of TortoiseGit and how to use them. It takes the form of a tutorial, starting with checking out a working copy, modifying it, committing your changes, etc. It then progresses to more advanced topics."
\r
147 #: ../source/TortoiseGit_en.xml:120
\r
149 msgid "<xref linkend=\"tsvn-subwcrev\"/> is a separate program included with TortoiseGit which can extract the information from your working copy and write it into a file. This is useful for including build information in your projects."
\r
152 #: ../source/TortoiseGit_en.xml:125
\r
154 msgid "The <xref linkend=\"tsvn-howto\"/> section answers some common questions about performing tasks which are not explicitly covered elsewhere."
\r
157 #: ../source/TortoiseGit_en.xml:129
\r
159 msgid "The section on <xref linkend=\"tsvn-automation\"/> shows how the TortoiseGit GUI dialogs can be called from the command line. This is useful for scripting where you still need user interaction."
\r
162 #: ../source/TortoiseGit_en.xml:134
\r
164 msgid "The <xref linkend=\"tsvn-cli\"/> give a correlation between TortoiseGit commands and their equivalents in the Git command line client <literal>svn.exe</literal>."
\r
167 #: ../source/TortoiseGit_en.xml:144
\r
169 msgid "TortoiseGit is free!"
\r
172 #: ../source/TortoiseGit_en.xml:145
\r
174 msgid "TortoiseGit is free. You don't have to pay to use it, and you can use it any way you want. It is developed under the GNU General Public License (GPL)."
\r
177 #: ../source/TortoiseGit_en.xml:149
\r
179 msgid "TortoiseGit is an Open Source project. That means you have full read access to the source code of this program. You can browse it on this link <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. You will be prompted to enter username and password. The username is <literal>guest</literal>, and the password must be left blank. The most recent version (where we're currently working) is located under <filename>/trunk/</filename>, and the released versions are located under <filename>/tags/</filename>."
\r
182 #: ../source/TortoiseGit_en.xml:168
\r
187 #: ../source/TortoiseGit_en.xml:169
\r
189 msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs."
\r
192 #: ../source/TortoiseGit_en.xml:180
\r
194 msgid "Acknowledgments"
\r
197 #: ../source/TortoiseGit_en.xml:183
\r
202 #: ../source/TortoiseGit_en.xml:185
\r
204 msgid "for founding the TortoiseGit project"
\r
207 #: ../source/TortoiseGit_en.xml:191
\r
209 msgid "Stefan Küng"
\r
212 #: ../source/TortoiseGit_en.xml:193
\r
214 msgid "for the hard work to get TortoiseGit to what it is now"
\r
217 #: ../source/TortoiseGit_en.xml:199
\r
219 msgid "Lübbe Onken"
\r
222 #: ../source/TortoiseGit_en.xml:201
\r
224 msgid "for the beautiful icons, logo, bug hunting, translating and managing the translations"
\r
227 #: ../source/TortoiseGit_en.xml:208
\r
229 msgid "Simon Large"
\r
232 #: ../source/TortoiseGit_en.xml:210
\r
234 msgid "for helping with the documentation and bug hunting"
\r
237 #: ../source/TortoiseGit_en.xml:216
\r
239 msgid "The Git Book"
\r
242 #: ../source/TortoiseGit_en.xml:218
\r
244 msgid "for the great introduction to Git and its chapter 2 which we copied here"
\r
247 #: ../source/TortoiseGit_en.xml:225
\r
249 msgid "The Tigris Style project"
\r
252 #: ../source/TortoiseGit_en.xml:227
\r
254 msgid "for some of the styles which are reused in this documentation"
\r
257 #: ../source/TortoiseGit_en.xml:233
\r
259 msgid "Our Contributors"
\r
262 #: ../source/TortoiseGit_en.xml:235
\r
264 msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list."
\r
267 #: ../source/TortoiseGit_en.xml:242
\r
269 msgid "Our Donators"
\r
272 #: ../source/TortoiseGit_en.xml:244
\r
274 msgid "for many hours of joy with the music they sent us"
\r
277 #: ../source/TortoiseGit_en.xml:255
\r
279 msgid "Terminology used in this document"
\r
282 #: ../source/TortoiseGit_en.xml:256
\r
284 msgid "To make reading the docs easier, the names of all the screens and Menus from TortoiseGit are marked up in a different font. The <guilabel>Log Dialog</guilabel> for instance."
\r
287 #: ../source/TortoiseGit_en.xml:261
\r
289 msgid "A menu choice is indicated with an arrow. <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Show Log</guimenuitem></menuchoice> means: select <emphasis>Show Log</emphasis> from the <emphasis>TortoiseGit</emphasis> context menu."
\r
292 #: ../source/TortoiseGit_en.xml:270
\r
294 msgid "Where a local context menu appears within one of the TortoiseGit dialogs, it is shown like this: <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Save As ...</guimenuitem></menuchoice>"
\r
297 #: ../source/TortoiseGit_en.xml:278
\r
299 msgid "User Interface Buttons are indicated like this: Press <guibutton>OK</guibutton> to continue."
\r
302 #: ../source/TortoiseGit_en.xml:282
\r
304 msgid "User Actions are indicated using a bold font. <keycap>Alt+A</keycap>: press the <keycap>Alt</keycap>-Key on your keyboard and while holding it down press the <keycap>A</keycap>-Key as well. <action>Right-drag</action>: press the right mouse button and while holding it down <emphasis>drag</emphasis> the items to the new location."
\r
307 #: ../source/TortoiseGit_en.xml:290
\r
309 msgid "System output and keyboard input is indicated with a <literal>different</literal> font as well."
\r
312 #: ../source/TortoiseGit_en.xml:295
\r
314 msgid "Important notes are marked with an icon."
\r
317 #: ../source/TortoiseGit_en.xml:300
\r
319 msgid "Tips that make your life easier."
\r
322 #: ../source/TortoiseGit_en.xml:305
\r
324 msgid "Places where you have to be careful what you are doing."
\r
327 #: ../source/TortoiseGit_en.xml:310
\r
329 msgid "Where extreme care has to be taken, data corruption or other nasty things may occur if these warnings are ignored."
\r
332 #: ../source/TortoiseGit_en.xml:319
\r
334 #: ../source/TortoiseGit_en.xml:1482
\r
336 #: ../source/TortoiseGit_en.xml:2481
\r
338 msgid "Introduction"
\r
341 #: ../source/TortoiseGit_en.xml:323
\r
343 msgid "version control"
\r
346 #: ../source/TortoiseGit_en.xml:325
\r
348 msgid "Version control is the art of managing changes to information. It has long been a critical tool for programmers, who typically spend their time making small changes to software and then undoing or checking some of those changes the next day. Imagine a team of such developers working concurrently - and perhaps even simultaneously on the very same files! - and you can see why a good system is needed to <emphasis>manage the potential chaos</emphasis>."
\r
351 #: ../source/TortoiseGit_en.xml:339
\r
353 msgid "What is TortoiseGit?"
\r
356 #: ../source/TortoiseGit_en.xml:340
\r
358 msgid "TortoiseGit is a free open-source client for the <firstterm>Git</firstterm> version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central <firstterm>repository</firstterm>. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of <quote>time machine</quote>."
\r
361 #: ../source/TortoiseGit_en.xml:352
\r
363 msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage <emphasis>any</emphasis> collection of files, including source code."
\r
366 #: ../source/TortoiseGit_en.xml:368
\r
368 msgid "TortoiseGit's History"
\r
371 #: ../source/TortoiseGit_en.xml:369
\r
373 msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS."
\r
376 #: ../source/TortoiseGit_en.xml:375
\r
378 msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain <literal>TortoiseGit.org</literal> and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained."
\r
381 #: ../source/TortoiseGit_en.xml:386
\r
383 msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation."
\r
386 #: ../source/TortoiseGit_en.xml:399
\r
388 msgid "TortoiseGit's Features"
\r
391 #: ../source/TortoiseGit_en.xml:400
\r
393 msgid "What makes TortoiseGit such a good Git client? Here's a short list of features."
\r
396 #: ../source/TortoiseGit_en.xml:406
\r
398 msgid "Shell integration"
\r
401 #: ../source/TortoiseGit_en.xml:409
\r
403 msgid "Windows shell"
\r
406 #: ../source/TortoiseGit_en.xml:412
\r
411 #: ../source/TortoiseGit_en.xml:414
\r
413 msgid "TortoiseGit integrates seamlessly into the Windows shell (i.e. the explorer). This means you can keep working with the tools you're already familiar with. And you do not have to change into a different application each time you need functions of the version control!"
\r
416 #: ../source/TortoiseGit_en.xml:421
\r
418 msgid "And you are not even forced to use the Windows Explorer. TortoiseGit's context menus work in many other file managers, and in the File/Open dialog which is common to most standard Windows applications. You should, however, bear in mind that TortoiseGit is intentionally developed as extension for the Windows Explorer. Thus it is possible that in other applications the integration is not as complete and e.g. the icon overlays may not be shown."
\r
421 #: ../source/TortoiseGit_en.xml:435
\r
423 msgid "Icon overlays"
\r
426 #: ../source/TortoiseGit_en.xml:437
\r
428 msgid "The status of every versioned file and folder is indicated by small overlay icons. That way you can see right away what the status of your working copy is."
\r
431 #: ../source/TortoiseGit_en.xml:445
\r
433 msgid "Easy access to Git commands"
\r
436 #: ../source/TortoiseGit_en.xml:447
\r
438 msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there."
\r
441 #: ../source/TortoiseGit_en.xml:454
\r
443 msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:"
\r
446 #: ../source/TortoiseGit_en.xml:460
\r
448 msgid "Directory versioning"
\r
451 #: ../source/TortoiseGit_en.xml:462
\r
453 msgid "CVS only tracks the history of individual files, but Git implements a <quote>virtual</quote> versioned filesystem that tracks changes to whole directory trees over time. Files <emphasis>and</emphasis> directories are versioned. As a result, there are real client-side <command>move</command> and <command>copy</command> commands that operate on files and directories."
\r
456 #: ../source/TortoiseGit_en.xml:475
\r
458 msgid "Atomic commits"
\r
461 #: ../source/TortoiseGit_en.xml:477
\r
463 msgid "A commit either goes into the repository completely, or not at all. This allows developers to construct and commit changes as logical chunks."
\r
466 #: ../source/TortoiseGit_en.xml:485
\r
468 msgid "Versioned metadata"
\r
471 #: ../source/TortoiseGit_en.xml:487
\r
473 msgid "Each file and directory has an invisible set of <quote>properties</quote> attached. You can invent and store any arbitrary key/value pairs you wish. Properties are versioned over time, just like file contents."
\r
476 #: ../source/TortoiseGit_en.xml:497
\r
478 msgid "Choice of network layers"
\r
481 #: ../source/TortoiseGit_en.xml:499
\r
483 msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's <quote>advanced</quote> network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh."
\r
486 #: ../source/TortoiseGit_en.xml:516
\r
488 msgid "Consistent data handling"
\r
491 #: ../source/TortoiseGit_en.xml:518
\r
493 msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network."
\r
496 #: ../source/TortoiseGit_en.xml:529
\r
498 msgid "Efficient branching and tagging"
\r
501 #: ../source/TortoiseGit_en.xml:531
\r
503 msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository."
\r
506 #: ../source/TortoiseGit_en.xml:542
\r
508 msgid "Hackability"
\r
511 #: ../source/TortoiseGit_en.xml:544
\r
513 msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages."
\r
516 #: ../source/TortoiseGit_en.xml:558
\r
518 msgid "Installing TortoiseGit"
\r
521 #: ../source/TortoiseGit_en.xml:560
\r
523 msgid "System requirements"
\r
526 #: ../source/TortoiseGit_en.xml:561
\r
528 msgid "TortoiseGit runs on Windows 2000 SP2, Windows XP or higher. Windows 98, Windows ME and Windows NT4 are no longer supported since TortoiseGit 1.2.0, but you can still download the older versions if you really need them."
\r
531 #: ../source/TortoiseGit_en.xml:567
\r
533 msgid "If you encounter any problems during or after installing TortoiseGit please refer to <xref linkend=\"tsvn-faq\"/> first."
\r
536 #: ../source/TortoiseGit_en.xml:575
\r
538 msgid "Installation"
\r
541 #: ../source/TortoiseGit_en.xml:577
\r
546 #: ../source/TortoiseGit_en.xml:579
\r
548 msgid "TortoiseGit comes with an easy to use installer. Double click on the installer file and follow the instructions. The installer will take care of the rest."
\r
551 #: ../source/TortoiseGit_en.xml:585
\r
553 msgid "You need Administrator privileges to install TortoiseGit."
\r
556 #: ../source/TortoiseGit_en.xml:591
\r
558 msgid "Language Packs"
\r
561 #: ../source/TortoiseGit_en.xml:593
\r
563 msgid "language packs"
\r
566 #: ../source/TortoiseGit_en.xml:596
\r
568 msgid "translations"
\r
571 #: ../source/TortoiseGit_en.xml:598
\r
573 msgid "The TortoiseGit user interface has been translated into many different languages, so you may be able to download a language pack to suit your needs. You can find the language packs on our <ulink url=\"http://TortoiseGit.net/translation_status\"><citetitle>translation status page</citetitle></ulink>. And if there is no language pack available yet, why not join the team and submit your own translation ;-)"
\r
576 #: ../source/TortoiseGit_en.xml:609
\r
578 msgid "Each language pack is packaged as a <literal>.exe</literal> installer. Just run the install program and follow the instructions. Next time you restart, the translation will be available."
\r
581 #: ../source/TortoiseGit_en.xml:616
\r
583 msgid "Spellchecker"
\r
586 #: ../source/TortoiseGit_en.xml:618
\r
588 msgid "spellchecker"
\r
591 #: ../source/TortoiseGit_en.xml:621
\r
596 #: ../source/TortoiseGit_en.xml:623
\r
598 msgid "TortoiseGit includes a spell checker which allows you to check your commit log messages. This is especially useful if the project language is not your native language. The spell checker uses the same dictionary files as <ulink url=\"http://openoffice.org\"><citetitle>OpenOffice</citetitle></ulink> and <ulink url=\"http://mozilla.org\"><citetitle>Mozilla</citetitle></ulink>."
\r
601 #: ../source/TortoiseGit_en.xml:636
\r
603 msgid "The installer automatically adds the US and UK English dictionaries. If you want other languages, the easiest option is simply to install one of TortoiseGit's language packs. This will install the appropriate dictionary files as well as the TortoiseGit local user interface. Next time you restart, the dictionary will be available too."
\r
606 #: ../source/TortoiseGit_en.xml:644
\r
608 msgid "Or you can install the dictionaries yourself. If you have OpenOffice or Mozilla installed, you can copy those dictionaries, which are located in the installation folders for those applications. Otherwise, you need to download the required dictionary files from <ulink url=\"http://wiki.services.openoffice.org/wiki/Dictionaries\"><citetitle>http://wiki.services.openoffice.org/wiki/Dictionaries</citetitle></ulink>"
\r
611 #: ../source/TortoiseGit_en.xml:661
\r
616 #: ../source/TortoiseGit_en.xml:666
\r
621 #: ../source/TortoiseGit_en.xml:653
\r
623 msgid "Once you have got the dictionary files, you probably need to rename them so that the filenames only have the locale chars in it. Example: <placeholder-1/> Then just copy them to the <filename>bin</filename> sub-folder of the TortoiseGit installation folder. Normally this will be <filename>C:\\Program Files\\TortoiseGit\\bin</filename>. If you don't want to litter the <filename>bin</filename> sub-folder, you can instead place your spell checker files in <filename>C:\\Program Files\\TortoiseGit\\Languages</filename>. If that folder isn't there, you have to create it first. The next time you start TortoiseGit, the spell checker will be available."
\r
626 #: ../source/TortoiseGit_en.xml:684
\r
628 msgid "Check the <literal>tsvn:projectlanguage</literal> setting. Refer to <xref linkend=\"tsvn-dug-propertypage\"/> for information about setting project properties."
\r
631 #: ../source/TortoiseGit_en.xml:691
\r
633 msgid "If no project language is set, or that language is not installed, try the language corresponding to the Windows locale."
\r
636 #: ../source/TortoiseGit_en.xml:697
\r
638 msgid "If the exact Windows locale doesn't work, try the <quote>Base</quote> language, eg. <literal>de_CH</literal> (Swiss-German) falls back to <literal>de_DE</literal> (German)."
\r
641 #: ../source/TortoiseGit_en.xml:705
\r
643 msgid "If none of the above works, then the default language is English, which is included with the standard installation."
\r
646 #: ../source/TortoiseGit_en.xml:679
\r
648 msgid "If you install multiple dictionaries, TortoiseGit uses these rules to select which one to use. <placeholder-1/>"
\r
651 #: ../source/TortoiseGit_en.xml:722
\r
653 msgid "Basic Concepts"
\r
656 #: ../source/TortoiseGit_en.xml:725
\r
661 #: ../source/TortoiseGit_en.xml:727
\r
663 msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: <ulink url=\"http://svnbook.red-bean.com/\"><citetitle>http://svnbook.red-bean.com/</citetitle></ulink>."
\r
666 #: ../source/TortoiseGit_en.xml:735
\r
668 msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use."
\r
671 #: ../source/TortoiseGit_en.xml:743
\r
673 msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers."
\r
676 #: ../source/TortoiseGit_en.xml:751
\r
678 #: ../source/TortoiseGit_en.xml:1256
\r
680 #: ../source/TortoiseGit_en.xml:2944
\r
682 msgid "The Repository"
\r
685 #: ../source/TortoiseGit_en.xml:753
\r
687 #: ../source/TortoiseGit_en.xml:3717
\r
692 #: ../source/TortoiseGit_en.xml:755
\r
694 msgid "Git is a centralized system for sharing information. At its core is a <firstterm>repository</firstterm>, which is a central store of data. The repository stores information in the form of a <firstterm>filesystem tree</firstterm> - a typical hierarchy of files and directories. Any number of <firstterm>clients</firstterm> connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others."
\r
697 #: ../source/TortoiseGit_en.xml:767
\r
699 msgid "A Typical Client/Server System"
\r
702 #: ../source/TortoiseGit_en.xml:770
\r
704 msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository <emphasis>is</emphasis> a kind of file server, but it's not your usual breed. What makes the Git repository special is that <emphasis>it remembers every change</emphasis> ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories."
\r
707 #: ../source/TortoiseGit_en.xml:780
\r
709 msgid "When a client reads data from the repository, it normally sees only the latest version of the filesystem tree. But the client also has the ability to view <emphasis>previous</emphasis> states of the filesystem. For example, a client can ask historical questions like, <quote>what did this directory contain last Wednesday?</quote>, or <quote>who was the last person to change this file, and what changes did they make?</quote> These are the sorts of questions that are at the heart of any <firstterm>version control system</firstterm>: systems that are designed to record and track changes to data over time."
\r
712 #: ../source/TortoiseGit_en.xml:795
\r
714 msgid "Versioning Models"
\r
717 #: ../source/TortoiseGit_en.xml:796
\r
719 msgid "All version control systems have to solve the same fundamental problem: how will the system allow users to share information, but prevent them from accidentally stepping on each other's feet? It's all too easy for users to accidentally overwrite each other's changes in the repository."
\r
722 #: ../source/TortoiseGit_en.xml:805
\r
724 msgid "The Problem of File-Sharing"
\r
727 #: ../source/TortoiseGit_en.xml:806
\r
729 msgid "Consider this scenario: suppose we have two co-workers, Harry and Sally. They each decide to edit the same repository file at the same time. If Harry saves his changes to the repository first, then it's possible that (a few moments later) Sally could accidentally overwrite them with her own new version of the file. While Harry's version of the file won't be lost forever (because the system remembers every change), any changes Harry made <emphasis>won't</emphasis> be present in Sally's newer version of the file, because she never saw Harry's changes to begin with. Harry's work is still effectively lost - or at least missing from the latest version of the file - and probably by accident. This is definitely a situation we want to avoid!"
\r
732 #: ../source/TortoiseGit_en.xml:822
\r
734 msgid "The Problem to Avoid"
\r
737 #: ../source/TortoiseGit_en.xml:827
\r
739 #: ../source/TortoiseGit_en.xml:843
\r
741 msgid "The Lock-Modify-Unlock Solution"
\r
744 #: ../source/TortoiseGit_en.xml:828
\r
746 msgid "Many version control systems use a <firstterm>lock-modify-unlock</firstterm> model to address this problem, which is a very simple solution. In such a system, the repository allows only one person to change a file at a time. First Harry must <emphasis>lock</emphasis> the file before he can begin making changes to it. Locking a file is a lot like borrowing a book from the library; if Harry has locked a file, then Sally cannot make any changes to it. If she tries to lock the file, the repository will deny the request. All she can do is read the file, and wait for Harry to finish his changes and release his lock. After Harry unlocks the file, his turn is over, and now Sally can take her turn by locking and editing."
\r
749 #: ../source/TortoiseGit_en.xml:846
\r
751 msgid "The problem with the lock-modify-unlock model is that it's a bit restrictive, and often becomes a roadblock for users:"
\r
754 #: ../source/TortoiseGit_en.xml:853
\r
756 msgid "<emphasis>Locking may cause administrative problems.</emphasis> Sometimes Harry will lock a file and then forget about it. Meanwhile, because Sally is still waiting to edit the file, her hands are tied. And then Harry goes on vacation. Now Sally has to get an administrator to release Harry's lock. The situation ends up causing a lot of unnecessary delay and wasted time."
\r
759 #: ../source/TortoiseGit_en.xml:864
\r
761 msgid "<emphasis>Locking may cause unnecessary serialization.</emphasis> What if Harry is editing the beginning of a text file, and Sally simply wants to edit the end of the same file? These changes don't overlap at all. They could easily edit the file simultaneously, and no great harm would come, assuming the changes were properly merged together. There's no need for them to take turns in this situation."
\r
764 #: ../source/TortoiseGit_en.xml:876
\r
766 msgid "<emphasis>Locking may create a false sense of security.</emphasis> Pretend that Harry locks and edits file A, while Sally simultaneously locks and edits file B. But suppose that A and B depend on one another, and the changes made to each are semantically incompatible. Suddenly A and B don't work together anymore. The locking system was powerless to prevent the problem - yet it somehow provided a sense of false security. It's easy for Harry and Sally to imagine that by locking files, each is beginning a safe, insulated task, and thus inhibits them from discussing their incompatible changes early on."
\r
769 #: ../source/TortoiseGit_en.xml:894
\r
771 #: ../source/TortoiseGit_en.xml:922
\r
773 msgid "The Copy-Modify-Merge Solution"
\r
776 #: ../source/TortoiseGit_en.xml:895
\r
778 msgid "Git, CVS, and other version control systems use a <firstterm>copy-modify-merge</firstterm> model as an alternative to locking. In this model, each user's client reads the repository and creates a personal <firstterm>working copy</firstterm> of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly."
\r
781 #: ../source/TortoiseGit_en.xml:907
\r
783 msgid "Here's an example. Say that Harry and Sally each create working copies of the same project, copied from the repository. They work concurrently, and make changes to the same file <filename>A</filename> within their copies. Sally saves her changes to the repository first. When Harry attempts to save his changes later, the repository informs him that his file A is <firstterm>out-of-date</firstterm>. In other words, that file A in the repository has somehow changed since he last copied it. So Harry asks his client to <firstterm>merge</firstterm> any new changes from the repository into his working copy of file A. Chances are that Sally's changes don't overlap with his own; so once he has both sets of changes integrated, he saves his working copy back to the repository."
\r
786 #: ../source/TortoiseGit_en.xml:926
\r
788 msgid "...Copy-Modify-Merge Continued"
\r
791 #: ../source/TortoiseGit_en.xml:930
\r
793 #: ../source/TortoiseGit_en.xml:4915
\r
798 #: ../source/TortoiseGit_en.xml:932
\r
800 msgid "But what if Sally's changes <emphasis>do</emphasis> overlap with Harry's changes? What then? This situation is called a <firstterm>conflict</firstterm>, and it's usually not much of a problem. When Harry asks his client to merge the latest repository changes into his working copy, his copy of file A is somehow flagged as being in a state of conflict: he'll be able to see both sets of conflicting changes, and manually choose between them. Note that software can't automatically resolve conflicts; only humans are capable of understanding and making the necessary intelligent choices. Once Harry has manually resolved the overlapping changes (perhaps by discussing the conflict with Sally!), he can safely save the merged file back to the repository."
\r
803 #: ../source/TortoiseGit_en.xml:947
\r
805 msgid "The copy-modify-merge model may sound a bit chaotic, but in practice, it runs extremely smoothly. Users can work in parallel, never waiting for one another. When they work on the same files, it turns out that most of their concurrent changes don't overlap at all; conflicts are infrequent. And the amount of time it takes to resolve conflicts is far less than the time lost by a locking system."
\r
808 #: ../source/TortoiseGit_en.xml:956
\r
810 msgid "In the end, it all comes down to one critical factor: user communication. When users communicate poorly, both syntactic and semantic conflicts increase. No system can force users to communicate perfectly, and no system can detect semantic conflicts. So there's no point in being lulled into a false promise that a locking system will somehow prevent conflicts; in practice, locking seems to inhibit productivity more than anything else."
\r
813 #: ../source/TortoiseGit_en.xml:966
\r
815 msgid "There is one common situation where the lock-modify-unlock model comes out better, and that is where you have unmergeable files. For example if your repository contains some graphic images, and two people change the image at the same time, there is no way for those changes to be merged together. Either Harry or Sally will lose their changes."
\r
818 #: ../source/TortoiseGit_en.xml:976
\r
820 msgid "What does Git Do?"
\r
823 #: ../source/TortoiseGit_en.xml:977
\r
825 msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need."
\r
828 #: ../source/TortoiseGit_en.xml:989
\r
830 msgid "Git in Action"
\r
833 #: ../source/TortoiseGit_en.xml:991
\r
835 msgid "Working Copies"
\r
838 #: ../source/TortoiseGit_en.xml:993
\r
840 msgid "working copy"
\r
843 #: ../source/TortoiseGit_en.xml:995
\r
845 msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them."
\r
848 #: ../source/TortoiseGit_en.xml:1000
\r
850 msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so."
\r
853 #: ../source/TortoiseGit_en.xml:1010
\r
855 msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to <emphasis>publish</emphasis> your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)."
\r
858 #: ../source/TortoiseGit_en.xml:1020
\r
860 msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named <filename>.svn</filename>, also known as the working copy <firstterm>administrative directory</firstterm>. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work."
\r
863 #: ../source/TortoiseGit_en.xml:1031
\r
865 msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository."
\r
868 #: ../source/TortoiseGit_en.xml:1038
\r
870 msgid "For example, suppose you have a repository that contains two software projects."
\r
873 #: ../source/TortoiseGit_en.xml:1043
\r
875 msgid "The Repository's Filesystem"
\r
878 #: ../source/TortoiseGit_en.xml:1046
\r
880 msgid "In other words, the repository's root directory has two subdirectories: <filename>paint</filename> and <filename>calc</filename>."
\r
883 #: ../source/TortoiseGit_en.xml:1051
\r
885 msgid "To get a working copy, you must <firstterm>check out</firstterm> some subtree of the repository. (The term <emphasis>check out</emphasis> may sound like it has something to do with locking or reserving resources, but it doesn't; it simply creates a private copy of the project for you)."
\r
888 #: ../source/TortoiseGit_en.xml:1058
\r
890 msgid "Suppose you make changes to <filename>button.c</filename>. Since the <filename>.svn</filename> directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as <firstterm>committing</firstterm> (or <firstterm>checking in</firstterm>) changes to the repository."
\r
893 #: ../source/TortoiseGit_en.xml:1068
\r
895 msgid "To publish your changes to others, you can use Git's <command>commit</command> command."
\r
898 #: ../source/TortoiseGit_en.xml:1072
\r
900 msgid "Now your changes to <filename>button.c</filename> have been committed to the repository; if another user checks out a working copy of <filename>/calc</filename>, they will see your changes in the latest version of the file."
\r
903 #: ../source/TortoiseGit_en.xml:1078
\r
905 msgid "Suppose you have a collaborator, Sally, who checked out a working copy of <filename>/calc</filename> at the same time you did. When you commit your change to <filename>button.c</filename>, Sally's working copy is left unchanged; Git only modifies working copies at the user's request."
\r
908 #: ../source/TortoiseGit_en.xml:1086
\r
910 msgid "To bring her project up to date, Sally can ask Git to <firstterm>update</firstterm> her working copy, by using the Git <command>update</command> command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out."
\r
913 #: ../source/TortoiseGit_en.xml:1094
\r
915 msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the <filename>.svn</filename> directory, and further information in the repository, to decide which files need to be brought up to date."
\r
918 #: ../source/TortoiseGit_en.xml:1103
\r
920 msgid "Repository URLs"
\r
923 #: ../source/TortoiseGit_en.xml:1104
\r
925 msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:"
\r
928 #: ../source/TortoiseGit_en.xml:1112
\r
930 msgid "Repository Access URLs"
\r
933 #: ../source/TortoiseGit_en.xml:1118
\r
938 #: ../source/TortoiseGit_en.xml:1119
\r
940 msgid "Access Method"
\r
943 #: ../source/TortoiseGit_en.xml:1125
\r
948 #: ../source/TortoiseGit_en.xml:1127
\r
950 msgid "Direct repository access on local or network drive."
\r
953 #: ../source/TortoiseGit_en.xml:1133
\r
955 #: ../source/TortoiseGit_en.xml:1144
\r
960 #: ../source/TortoiseGit_en.xml:1135
\r
962 msgid "Access via WebDAV protocol to Git-aware Apache server."
\r
965 #: ../source/TortoiseGit_en.xml:1141
\r
970 #: ../source/TortoiseGit_en.xml:1143
\r
972 msgid "Same as <placeholder-1/>, but with SSL encryption."
\r
975 #: ../source/TortoiseGit_en.xml:1149
\r
980 #: ../source/TortoiseGit_en.xml:1153
\r
982 #: ../source/TortoiseGit_en.xml:1162
\r
984 #: ../source/TortoiseGit_en.xml:2483
\r
986 #: ../source/TortoiseGit_en.xml:2622
\r
991 #: ../source/TortoiseGit_en.xml:1151
\r
993 msgid "Unauthenticated TCP/IP access via custom protocol to a <placeholder-1/> server."
\r
996 #: ../source/TortoiseGit_en.xml:1158
\r
1001 #: ../source/TortoiseGit_en.xml:1160
\r
1003 msgid "authenticated, encrypted TCP/IP access via custom protocol to a <placeholder-1/> server."
\r
1006 #: ../source/TortoiseGit_en.xml:1168
\r
1008 msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The <literal>file://</literal> access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form <systemitem class=\"url\">file://hostname/path/to/repos</systemitem>. For the local machine, the <literal>hostname</literal> portion of the URL is required to be either absent or <literal>localhost</literal>. For this reason, local paths normally appear with three slashes, <systemitem class=\"url\">file:///path/to/repos</systemitem>."
\r
1011 #: ../source/TortoiseGit_en.xml:1181
\r
1013 msgid "Also, users of the <literal>file://</literal> scheme on Windows platforms will need to use an unofficially <quote>standard</quote> syntax for accessing repositories that are on the same machine, but on a different drive than the client's current working drive. Either of the two following URL path syntaxes will work where <literal>X</literal> is the drive on which the repository resides:"
\r
1016 #: ../source/TortoiseGit_en.xml:1191
\r
1019 msgid "\nfile:///X:/path/to/repos\n...\nfile:///X|/path/to/repos\n...\n"
\r
1022 #: ../source/TortoiseGit_en.xml:1197
\r
1024 msgid "Note that a URL uses ordinary slashes even though the native (non-URL) form of a path on Windows uses backslashes."
\r
1027 #: ../source/TortoiseGit_en.xml:1201
\r
1029 msgid "You can safely access a FSFS repository via a network share, but you <emphasis>cannot</emphasis> access a BDB repository in this way."
\r
1032 #: ../source/TortoiseGit_en.xml:1207
\r
1034 #: ../source/TortoiseGit_en.xml:2609
\r
1036 msgid "Do not create or access a Berkeley DB repository on a network share. It <emphasis>cannot</emphasis> exist on a remote filesystem. Not even if you have the network drive mapped to a drive letter. If you attempt to use Berkeley DB on a network share, the results are unpredictable - you may see mysterious errors right away, or it may be months before you discover that your repository database is subtly corrupted."
\r
1039 #: ../source/TortoiseGit_en.xml:1219
\r
1044 #: ../source/TortoiseGit_en.xml:1221
\r
1046 #: ../source/TortoiseGit_en.xml:9751
\r
1051 #: ../source/TortoiseGit_en.xml:1223
\r
1053 msgid "A <command>svn commit</command> operation can publish changes to any number of files and directories as a single atomic transaction. In your working copy, you can change files' contents, create, delete, rename and copy files and directories, and then commit the complete set of changes as a unit."
\r
1056 #: ../source/TortoiseGit_en.xml:1231
\r
1058 msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions."
\r
1061 #: ../source/TortoiseGit_en.xml:1238
\r
1063 msgid "Each time the repository accepts a commit, this creates a new state of the filesystem tree, called a <firstterm>revision</firstterm>. Each revision is assigned a unique natural number, one greater than the number of the previous revision. The initial revision of a freshly created repository is numbered zero, and consists of nothing but an empty root directory."
\r
1066 #: ../source/TortoiseGit_en.xml:1247
\r
1068 msgid "A nice way to visualize the repository is as a series of trees. Imagine an array of revision numbers, starting at 0, stretching from left to right. Each revision number has a filesystem tree hanging below it, and each tree is a <quote>snapshot</quote> of the way the repository looked after each commit."
\r
1071 #: ../source/TortoiseGit_en.xml:1260
\r
1073 msgid "Global Revision Numbers"
\r
1076 #: ../source/TortoiseGit_en.xml:1261
\r
1078 msgid "Unlike those of many other version control systems, Git's revision numbers apply to <emphasis>entire trees</emphasis>, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of <filename>foo.c</filename>'', they really mean ``<filename>foo.c</filename> as it appears in revision 5.'' Notice that in general, revisions N and M of a file do <emphasis>not</emphasis> necessarily differ!"
\r
1081 #: ../source/TortoiseGit_en.xml:1276
\r
1083 msgid "It's important to note that working copies do not always correspond to any single revision in the repository; they may contain files from several different revisions. For example, suppose you check out a working copy from a repository whose most recent revision is 4:"
\r
1086 #: ../source/TortoiseGit_en.xml:1283
\r
1089 msgid "\ncalc/Makefile:4\n integer.c:4\n button.c:4\n"
\r
1092 #: ../source/TortoiseGit_en.xml:1288
\r
1094 msgid "At the moment, this working directory corresponds exactly to revision 4 in the repository. However, suppose you make a change to <filename>button.c</filename>, and commit that change. Assuming no other commits have taken place, your commit will create revision 5 of the repository, and your working copy will now look like this:"
\r
1097 #: ../source/TortoiseGit_en.xml:1296
\r
1100 msgid "\ncalc/Makefile:4\n integer.c:4\n button.c:5\n"
\r
1103 #: ../source/TortoiseGit_en.xml:1301
\r
1105 msgid "Suppose that, at this point, Sally commits a change to <filename>integer.c</filename>, creating revision 6. If you use <command>svn update</command> to bring your working copy up to date, then it will look like this:"
\r
1108 #: ../source/TortoiseGit_en.xml:1307
\r
1111 msgid "\ncalc/Makefile:6\n integer.c:6\n button.c:6\n"
\r
1114 #: ../source/TortoiseGit_en.xml:1312
\r
1116 msgid "Sally's changes to <filename>integer.c</filename> will appear in your working copy, and your change will still be present in <filename>button.c</filename>. In this example, the text of <filename>Makefile</filename> is identical in revisions 4, 5, and 6, but Git will mark your working copy of <filename>Makefile</filename> with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository."
\r
1119 #: ../source/TortoiseGit_en.xml:1325
\r
1121 msgid "How Working Copies Track the Repository"
\r
1124 #: ../source/TortoiseGit_en.xml:1326
\r
1126 msgid "For each file in a working directory, Git records two essential pieces of information in the <filename>.svn/</filename> administrative area:"
\r
1129 #: ../source/TortoiseGit_en.xml:1332
\r
1131 msgid "what revision your working file is based on (this is called the file's <firstterm>working revision</firstterm>), and"
\r
1134 #: ../source/TortoiseGit_en.xml:1339
\r
1136 msgid "a timestamp recording when the local copy was last updated by the repository."
\r
1139 #: ../source/TortoiseGit_en.xml:1345
\r
1141 msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:"
\r
1144 #: ../source/TortoiseGit_en.xml:1352
\r
1146 msgid "Unchanged, and current"
\r
1149 #: ../source/TortoiseGit_en.xml:1354
\r
1151 msgid "The file is unchanged in the working directory, and no changes to that file have been committed to the repository since its working revision. A <command>commit</command> of the file will do nothing, and an <command>update</command> of the file will do nothing."
\r
1154 #: ../source/TortoiseGit_en.xml:1365
\r
1156 msgid "Locally changed, and current"
\r
1159 #: ../source/TortoiseGit_en.xml:1367
\r
1161 msgid "The file has been changed in the working directory, and no changes to that file have been committed to the repository since its base revision. There are local changes that have not been committed to the repository, thus a <command>commit</command> of the file will succeed in publishing your changes, and an <command>update</command> of the file will do nothing."
\r
1164 #: ../source/TortoiseGit_en.xml:1379
\r
1166 msgid "Unchanged, and out-of-date"
\r
1169 #: ../source/TortoiseGit_en.xml:1381
\r
1171 msgid "The file has not been changed in the working directory, but it has been changed in the repository. The file should eventually be updated, to make it current with the public revision. A <command>commit</command> of the file will do nothing, and an <command>update</command> of the file will fold the latest changes into your working copy."
\r
1174 #: ../source/TortoiseGit_en.xml:1393
\r
1176 msgid "Locally changed, and out-of-date"
\r
1179 #: ../source/TortoiseGit_en.xml:1395
\r
1181 msgid "The file has been changed both in the working directory, and in the repository. A <command>commit</command> of the file will fail with an <emphasis>out-of-date</emphasis> error. The file should be updated first; an <command>update</command> command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict."
\r
1184 #: ../source/TortoiseGit_en.xml:1412
\r
1189 #: ../source/TortoiseGit_en.xml:1413
\r
1191 msgid "We've covered a number of fundamental Git concepts in this chapter:"
\r
1194 #: ../source/TortoiseGit_en.xml:1419
\r
1196 msgid "We've introduced the notions of the central repository, the client working copy, and the array of repository revision trees."
\r
1199 #: ../source/TortoiseGit_en.xml:1425
\r
1201 msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model."
\r
1204 #: ../source/TortoiseGit_en.xml:1432
\r
1206 msgid "We've talked a bit about the way Git tracks and manages information in a working copy."
\r
1209 #: ../source/TortoiseGit_en.xml:1445
\r
1211 msgid "Setting Up A Server"
\r
1214 #: ../source/TortoiseGit_en.xml:1447
\r
1216 msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the <literal>file://</literal> protocol or you can place them on a server and access them with the <literal>http://</literal> or <literal>svn://</literal> protocols. The two server protocols can also be encrypted. You use <literal>https://</literal> or <literal>svn+ssh://</literal>. This chapter shows you step by step on how you can set up such a server on a Windows machine."
\r
1219 #: ../source/TortoiseGit_en.xml:1458
\r
1221 msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.serverconfig.html\"><citetitle>Server Configuration</citetitle></ulink>."
\r
1224 #: ../source/TortoiseGit_en.xml:1466
\r
1226 msgid "If you don't have a server and you work alone then local repositories are probably your best choice. You can skip this chapter and go directly to <xref linkend=\"tsvn-repository\"/>."
\r
1229 #: ../source/TortoiseGit_en.xml:1471
\r
1231 msgid "If you were thinking about setting up a multi-user repository on a network share, think again. Read <xref linkend=\"tsvn-repository-local-share\"/> to find out why we think this is a bad idea."
\r
1234 #: ../source/TortoiseGit_en.xml:1480
\r
1236 msgid "Apache Based Server"
\r
1239 #: ../source/TortoiseGit_en.xml:1484
\r
1244 #: ../source/TortoiseGit_en.xml:1486
\r
1246 msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:"
\r
1249 #: ../source/TortoiseGit_en.xml:1492
\r
1251 #: ../source/TortoiseGit_en.xml:1496
\r
1256 #: ../source/TortoiseGit_en.xml:1498
\r
1258 msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a <quote>Web folder</quote> in the Windows explorer and then access it like any other folder in the file system."
\r
1261 #: ../source/TortoiseGit_en.xml:1509
\r
1263 msgid "Browsing The Repository"
\r
1266 #: ../source/TortoiseGit_en.xml:1511
\r
1268 msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users."
\r
1271 #: ../source/TortoiseGit_en.xml:1521
\r
1273 #: ../source/TortoiseGit_en.xml:3646
\r
1275 msgid "Authentication"
\r
1278 #: ../source/TortoiseGit_en.xml:1523
\r
1280 msgid "You can use any authentication mechanism Apache supports, including SSPI and LDAP."
\r
1283 #: ../source/TortoiseGit_en.xml:1530
\r
1288 #: ../source/TortoiseGit_en.xml:1532
\r
1290 msgid "Since Apache is very stable and secure, you automatically get the same security for your repository. This includes SSL encryption."
\r
1293 #: ../source/TortoiseGit_en.xml:1542
\r
1295 msgid "Installing Apache"
\r
1298 #: ../source/TortoiseGit_en.xml:1547
\r
1300 msgid "Please note that Windows XP without the service pack 1 will lead to bogus network data and could therefore corrupt your repository!"
\r
1303 #: ../source/TortoiseGit_en.xml:1555
\r
1305 msgid "Download the latest version of the Apache web server from <ulink url=\"http://httpd.apache.org/download.cgi\"><citetitle>http://httpd.apache.org/download.cgi</citetitle></ulink>. Make sure that you download the version 2.2.x - the version 1.3.xx won't work!"
\r
1308 #: ../source/TortoiseGit_en.xml:1564
\r
1310 msgid "The msi installer for Apache can be found by clicking on <literal>other files</literal>, then browse to <filename>binaries/win32</filename>. You may want to choose the msi file <filename>apache-2.2.x-win32-x86-openssl-0.9.x.msi</filename> (the one that includes OpenSSL)."
\r
1313 #: ../source/TortoiseGit_en.xml:1572
\r
1315 msgid "Once you have the Apache2 installer you can double click on it and it will guide you through the installation process. Make sure that you enter the server-URL correctly (if you don't have a DNS name for your server just enter the IP-address). I recommend to install Apache <emphasis>for All Users, on Port 80, as a Service</emphasis>. Note: if you already have IIS or any other program running which listens on port 80 the installation might fail. If that happens, go to the programs directory, <filename>\\Apache Group\\Apache2\\conf</filename> and locate the file <filename>httpd.conf</filename>. Edit that file so that <literal>Listen 80</literal> is changed to a free port, e.g. <literal>Listen 81</literal>. Then restart the installation - this time it should finish without problems."
\r
1318 #: ../source/TortoiseGit_en.xml:1594
\r
1320 msgid "Now test if the Apache web server is running correctly by pointing your web browser to <systemitem class=\"url\">http://localhost/</systemitem> - a preconfigured Website should show up."
\r
1323 #: ../source/TortoiseGit_en.xml:1603
\r
1325 msgid "If you decide to install Apache as a service, be warned that by default it will run as the local system account. It would be a more secure practice for you to create a separate account for Apache to run as."
\r
1328 #: ../source/TortoiseGit_en.xml:1609
\r
1330 msgid "Make sure that the account on the server that Apache is running as has an explicit entry in the repository directory's access control list (right-click directory | properties | security), with full control. Otherwise, users will not be able to commit their changes."
\r
1333 #: ../source/TortoiseGit_en.xml:1615
\r
1335 msgid "Even if Apache runs as local system, you still need such an entry (which will be the SYSTEM account in this case)."
\r
1338 #: ../source/TortoiseGit_en.xml:1619
\r
1340 msgid "If Apache does not have this permission set up, your users will get <quote>Access denied</quote> error messages, which show up in the Apache error log as error 500."
\r
1343 #: ../source/TortoiseGit_en.xml:1543
\r
1345 msgid "The first thing you need before installing Apache is a computer with Windows 2000, Windows XP+SP1, Windows 2003, Vista or Server 2008. <warning><placeholder-1/></warning><placeholder-2/><caution><placeholder-3/><placeholder-4/><placeholder-5/><placeholder-6/></caution>"
\r
1348 #: ../source/TortoiseGit_en.xml:1628
\r
1350 msgid "Installing Git"
\r
1353 #: ../source/TortoiseGit_en.xml:1632
\r
1355 msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to <ulink url=\"http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100\"><citetitle>http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100</citetitle></ulink>."
\r
1358 #: ../source/TortoiseGit_en.xml:1644
\r
1360 msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps."
\r
1363 #: ../source/TortoiseGit_en.xml:1654
\r
1365 #: ../source/TortoiseGit_en.xml:1982
\r
1367 msgid "mod_authz_svn"
\r
1370 #: ../source/TortoiseGit_en.xml:1656
\r
1372 msgid "Using the windows explorer, go to the installation directory of Git (usually <filename>c:\\program files\\Git</filename>) and find the files <filename>/httpd/mod_dav_svn.so</filename> and <filename>mod_authz_svn.so</filename>. Copy these files to the Apache modules directory (usually <filename>c:\\program files\\apache group\\apache2\\modules </filename>)."
\r
1375 #: ../source/TortoiseGit_en.xml:1669
\r
1377 msgid "Copy the file <filename>/bin/libdb*.dll</filename> and <filename>/bin/intl3_svn.dll</filename> from the Git installation directory to the Apache bin directory."
\r
1380 #: ../source/TortoiseGit_en.xml:1677
\r
1382 msgid "Edit Apache's configuration file (usually <filename> C:\\Program Files\\Apache Group\\Apache2\\conf\\httpd.conf</filename>) with a text editor such as Notepad and make the following changes:"
\r
1385 #: ../source/TortoiseGit_en.xml:1683
\r
1387 msgid "Uncomment (remove the '<literal>#</literal>' mark) the following lines: <screen>\n#LoadModule dav_fs_module modules/mod_dav_fs.so\n#LoadModule dav_module modules/mod_dav.so\n</screen> Add the following two lines to the end of the <literal>LoadModule</literal> section. <screen>\nLoadModule dav_svn_module modules/mod_dav_svn.so\nLoadModule authz_svn_module modules/mod_authz_svn.so\n</screen>"
\r
1390 #: ../source/TortoiseGit_en.xml:1702
\r
1392 #: ../source/TortoiseGit_en.xml:12837
\r
1394 msgid "Configuration"
\r
1397 #: ../source/TortoiseGit_en.xml:1713
\r
1399 msgid "At the end of the config file add the following lines: <screen>\n<Location /svn>\n DAV svn\n SVNListParentPath on\n SVNParentPath D:\\SVN\n #SVNIndexXSLT \"/svnindex.xsl\"\n AuthType Basic\n AuthName \"Git repositories\"\n AuthUserFile passwd\n #AuthzSVNAccessFile svnaccessfile\n Require valid-user\n</Location>\n</screen> This configures Apache so that all your Git repositories are physically located below <filename>D:\\SVN</filename>. The repositories are served to the outside world from the URL: <systemitem class=\"url\"> http://MyServer/svn/ </systemitem>. Access is restricted to known users/passwords listed in the <filename>passwd</filename> file."
\r
1402 #: ../source/TortoiseGit_en.xml:1740
\r
1404 msgid "To create the <filename>passwd</filename> file, open the command prompt (DOS-Box) again, change to the <filename>apache2</filename> folder (usually <filename>c:\\program files\\apache group\\apache2</filename>) and create the file by entering <screen>\nbin\\htpasswd -c passwd <username>\n</screen> This will create a file with the name <filename>passwd</filename> which is used for authentication. Additional users can be added with <screen>\nbin\\htpasswd passwd <username>\n</screen>"
\r
1407 #: ../source/TortoiseGit_en.xml:1759
\r
1409 msgid "Restart the Apache service again."
\r
1412 #: ../source/TortoiseGit_en.xml:1764
\r
1414 msgid "Point your browser to <systemitem class=\"url\">http://MyServer/svn/MyNewRepository</systemitem> (where <filename>MyNewRepository</filename> is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository."
\r
1417 #: ../source/TortoiseGit_en.xml:1703
\r
1419 msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in <filename>c:\\program files\\apache group\\apache2\\conf\\httpd.conf</filename>) with any text editor you like (e.g. Notepad): <placeholder-1/>"
\r
1422 #: ../source/TortoiseGit_en.xml:1777
\r
1427 #: ../source/TortoiseGit_en.xml:1780
\r
1429 #: ../source/TortoiseGit_en.xml:1815
\r
1431 #: ../source/TortoiseGit_en.xml:1950
\r
1433 msgid "SVNParentPath"
\r
1436 #: ../source/TortoiseGit_en.xml:1785
\r
1438 msgid "Apache <filename>httpd.conf</filename> Settings"
\r
1441 #: ../source/TortoiseGit_en.xml:1791
\r
1446 #: ../source/TortoiseGit_en.xml:1792
\r
1448 msgid "Explanation"
\r
1451 #: ../source/TortoiseGit_en.xml:1800
\r
1453 msgid "http://MyServer/svn/"
\r
1456 #: ../source/TortoiseGit_en.xml:1798
\r
1458 msgid "means that the Git repositories are available from the URL <placeholder-1/>"
\r
1461 #: ../source/TortoiseGit_en.xml:1805
\r
1463 msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module."
\r
1466 #: ../source/TortoiseGit_en.xml:1812
\r
1468 msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under <placeholder-1/>."
\r
1471 #: ../source/TortoiseGit_en.xml:1822
\r
1476 #: ../source/TortoiseGit_en.xml:1820
\r
1478 msgid "tells Git to look for repositories below <placeholder-1/>"
\r
1481 #: ../source/TortoiseGit_en.xml:1827
\r
1483 msgid "Used to make the browsing with a web browser prettier."
\r
1486 #: ../source/TortoiseGit_en.xml:1834
\r
1488 msgid "is to activate basic authentication, i.e. Username/password"
\r
1491 #: ../source/TortoiseGit_en.xml:1841
\r
1493 msgid "is used as an information whenever an authentication dialog pops up to tell the user what the authentication is for"
\r
1496 #: ../source/TortoiseGit_en.xml:1848
\r
1498 msgid "specifies which password file to use for authentication"
\r
1501 #: ../source/TortoiseGit_en.xml:1854
\r
1503 msgid "Location of the Access file for paths inside a Git repository"
\r
1506 #: ../source/TortoiseGit_en.xml:1861
\r
1508 msgid "specifies that only users who entered a correct username/password are allowed to access the URL"
\r
1511 #: ../source/TortoiseGit_en.xml:1873
\r
1513 msgid "If you want your repository to have read access for everyone but write access only for specific users you can change the line <screen>\nRequire valid-user\n</screen> to <screen>\n<LimitExcept GET PROPFIND OPTIONS REPORT>\nRequire valid-user\n</LimitExcept>\n</screen>"
\r
1516 #: ../source/TortoiseGit_en.xml:1888
\r
1518 msgid "Using a <filename>passwd</filename> file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line <screen>\n#AuthzSVNAccessFile svnaccessfile\n</screen> and create a Git access file. Apache will make sure that only valid users are able to access your <filename>/svn</filename> location, and will then pass the username to Git's <literal>AuthzSVNAccessFile</literal> module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as <literal>repos:path</literal> or simply <literal>path</literal>. If you don't specify a particular repository, that access rule will apply to all repositories under <literal>SVNParentPath</literal>. The format of the authorization-policy file used by <literal>mod_authz_svn</literal> is described in <xref linkend=\"tsvn-serversetup-mod_authz_svn\"/>"
\r
1521 #: ../source/TortoiseGit_en.xml:1915
\r
1523 msgid "To make browsing the repository with a web browser 'prettier', uncomment the line <screen>\n#SVNIndexXSLT \"/svnindex.xsl\"\n</screen> and put the files <filename>svnindex.xsl</filename>, <filename>svnindex.css</filename> and <filename>menucheckout.ico</filename> in your document root directory (usually <filename>C:/Program Files/Apache Group/Apache2/htdocs</filename>). The directory is set with the <literal>DocumentRoot</literal> directive in your Apache config file."
\r
1526 #: ../source/TortoiseGit_en.xml:1928
\r
1528 msgid "You can get those three files directly from our source repository at <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/other/svnindex\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/other/svnindex</citetitle></ulink>. (<xref linkend=\"tsvn-preface-source\"/> explains how to access the TortoiseGit source repository)."
\r
1531 #: ../source/TortoiseGit_en.xml:1936
\r
1533 msgid "The XSL file from the TortoiseGit repository has a nice gimmick: if you browse the repository with your web browser, then every folder in your repository has an icon on the right shown. If you click on that icon, the TortoiseGit checkout dialog is started for this URL."
\r
1536 #: ../source/TortoiseGit_en.xml:1782
\r
1538 msgid "A short explanation of what you just entered: <placeholder-1/> But that's just an example. There are many, many more possibilities of what you can do with the Apache web server. <placeholder-2/>"
\r
1541 #: ../source/TortoiseGit_en.xml:1948
\r
1543 msgid "Multiple Repositories"
\r
1546 #: ../source/TortoiseGit_en.xml:1953
\r
1548 msgid "Index of projects"
\r
1551 #: ../source/TortoiseGit_en.xml:1955
\r
1553 msgid "If you used the <literal>SVNParentPath</literal> directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Create repository here...</guimenuitem></menuchoice> and a new project has a home..."
\r
1556 #: ../source/TortoiseGit_en.xml:1969
\r
1558 msgid "If you are using Git 1.3 or later, you can use the <literal>SVNListParentPath on</literal> directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository."
\r
1561 #: ../source/TortoiseGit_en.xml:1977
\r
1563 msgid "Path-Based Authorization"
\r
1566 #: ../source/TortoiseGit_en.xml:1979
\r
1568 msgid "Authorization"
\r
1571 #: ../source/TortoiseGit_en.xml:1984
\r
1573 msgid "The <literal>mod_authz_svn</literal> module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well."
\r
1576 #: ../source/TortoiseGit_en.xml:1990
\r
1578 msgid "An example file would look like this: <screen>\n[groups]\nadmin = john, kate\ndevteam1 = john, rachel, sally\ndevteam2 = kate, peter, mark\ndocs = bob, jane, mike\ntraining = zak\n# Default access rule for ALL repositories\n# Everyone can read, admins can write, Dan German is excluded.\n[/]\n* = r\n@admin = rw\ndangerman =\n# Allow developers complete access to their project repos\n[proj1:/]\n@devteam1 = rw\n[proj2:/]\n@devteam2 = rw\n[bigproj:/]\n@devteam1 = rw\n@devteam2 = rw\ntrevor = rw\n# Give the doc people write access to all the docs folders\n[/trunk/doc]\n@docs = rw\n# Give trainees write access in the training repository only\n[TrainingRepos:/]\n@training = rw\n</screen>"
\r
1581 #: ../source/TortoiseGit_en.xml:2022
\r
1583 msgid "Note that checking every path can be an expensive operation, particularly in the case of the revision log. The server checks every changed path in each revision and checks it for readability, which can be time-consuming on revisions which affect large numbers of files."
\r
1586 #: ../source/TortoiseGit_en.xml:2029
\r
1588 msgid "Authentication and authorization are separate processes. If a user wants to gain access to a repository path, she has to meet <emphasis>both</emphasis>, the usual authentication requirements and the authorization requirements of the access file."
\r
1591 #: ../source/TortoiseGit_en.xml:2037
\r
1593 msgid "Authentication With a Windows Domain"
\r
1596 #: ../source/TortoiseGit_en.xml:2039
\r
1598 msgid "Windows domain"
\r
1601 #: ../source/TortoiseGit_en.xml:2042
\r
1603 msgid "domaincontroller"
\r
1606 #: ../source/TortoiseGit_en.xml:2044
\r
1608 msgid "As you might have noticed you need to make a username/password entry in the <filename>passwd</filename> file for each user separately. And if (for security reasons) you want your users to periodically change their passwords you have to make the change manually."
\r
1611 #: ../source/TortoiseGit_en.xml:2051
\r
1613 msgid "But there's a solution for that problem - at least if you're accessing the repository from inside a LAN with a windows domain controller: <literal>mod_auth_sspi</literal>!"
\r
1616 #: ../source/TortoiseGit_en.xml:2057
\r
1621 #: ../source/TortoiseGit_en.xml:2060
\r
1626 #: ../source/TortoiseGit_en.xml:2062
\r
1628 msgid "The original SSPI module was offered by Syneapps including source code. But the development for it has been stopped. But don't despair, the community has picked it up and improved it. It has a new home on <ulink url=\"http://sourceforge.net/projects/mod-auth-sspi/\"><citetitle>SourceForge</citetitle></ulink>."
\r
1631 #: ../source/TortoiseGit_en.xml:2073
\r
1633 msgid "Download the module which matches your apache version, then copy the file <filename>mod_auth_sspi.so</filename> into the Apache modules folder."
\r
1636 #: ../source/TortoiseGit_en.xml:2080
\r
1638 msgid "Edit the Apache config file: add the line <screen>\nLoadModule sspi_auth_module modules/mod_auth_sspi.so\n</screen> to the <literal>LoadModule</literal> section. Make sure you insert this line <emphasis>before</emphasis> the line <screen>\nLoadModule auth_module modules/mod_auth.so\n</screen>"
\r
1641 #: ../source/TortoiseGit_en.xml:2093
\r
1643 msgid "To make the Git location use this type of authentication you have to change the line <screen>\nAuthType Basic\n</screen> to <screen>\nAuthType SSPI\n</screen> also you need to add <screen>\nSSPIAuth On\nSSPIAuthoritative On\nSSPIDomain <domaincontroller>\nSSPIOmitDomain on\nSSPIUsernameCase lower\nSSPIPerRequestAuth on\nSSPIOfferBasic On\n</screen> within the <literal><Location /svn></literal> block. If you don't have a domain controller, leave the name of the domain control as <literal><domaincontroller></literal>."
\r
1646 #: ../source/TortoiseGit_en.xml:2119
\r
1648 msgid "Note that if you are authenticating using SSPI, then you don't need the <literal>AuthUserFile</literal> line to define a password file any more. Apache authenticates your username and password against your windows domain instead. You will need to update the users list in your <filename>svnaccessfile</filename> to reference <literal>DOMAIN\\username</literal> as well."
\r
1651 #: ../source/TortoiseGit_en.xml:2129
\r
1653 msgid "The SSPI authentication is only enabled for SSL secured connections (https). If you're only using normal http connections to your server, it won't work."
\r
1656 #: ../source/TortoiseGit_en.xml:2134
\r
1658 msgid "To enable SSL on your server, see the chapter: <xref linkend=\"tsvn-serversetup-apache-7\"/>"
\r
1661 #: ../source/TortoiseGit_en.xml:2140
\r
1663 msgid "Git <filename>AuthzSVNAccessFile</filename> files are case sensitive in regard to user names (<literal>JUser</literal> is different from <literal>juser</literal>)."
\r
1666 #: ../source/TortoiseGit_en.xml:2145
\r
1668 msgid "In Microsoft's world, Windows domains and user names are not case sensitive. Even so, some network administrators like to create user accounts in CamelCase (e.g. <literal>JUser</literal>)."
\r
1671 #: ../source/TortoiseGit_en.xml:2150
\r
1673 msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with."
\r
1676 #: ../source/TortoiseGit_en.xml:2158
\r
1678 msgid "The end result is that you may need at least two entries in your <literal>AuthzSVNAccessFile</literal> for each user -- a lowercase entry and an entry in the same case that Internet Explorer passes to Apache. You will also need to train your users to also type in their credentials using lower case when accessing repositories via TortoiseGit."
\r
1681 #: ../source/TortoiseGit_en.xml:2166
\r
1683 msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's <literal>AuthzSVNAccessFile</literal> module. You may need to experiment with the exact format of the user string in the <literal>svnaccessfile</literal> (e.g. <literal>DOMAIN\\user</literal> vs. <literal>DOMAIN//user</literal>) in order to get everything working."
\r
1686 #: ../source/TortoiseGit_en.xml:2180
\r
1688 msgid "Multiple Authentication Sources"
\r
1691 #: ../source/TortoiseGit_en.xml:2182
\r
1693 msgid "Multiple authentication"
\r
1696 #: ../source/TortoiseGit_en.xml:2184
\r
1698 msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password."
\r
1701 #: ../source/TortoiseGit_en.xml:2190
\r
1703 msgid "A common scenario is to use both Windows domain authentication and a <literal>passwd</literal> file, so that you can provide SVN access to users who don't have a Windows domain login."
\r
1706 #: ../source/TortoiseGit_en.xml:2197
\r
1708 msgid "To enable both Windows domain and <filename>passwd</filename> file authentication, add the following entries within the <literal><Location></literal> block of your Apache config file: <screen>\nAuthBasicAuthoritative Off\nSSPIAuthoritative Off\n</screen>"
\r
1711 #: ../source/TortoiseGit_en.xml:2208
\r
1713 msgid "Here is an example of the full Apache configuration for combined Windows domain and <literal>passwd</literal> file authentication: <screen>\n<Location /svn>\n DAV svn\n SVNListParentPath on\n SVNParentPath D:\\SVN\n\n AuthName \"Git repositories\"\n AuthzSVNAccessFile svnaccessfile.txt\n\n# NT Domain Logins.\n AuthType SSPI\n SSPIAuth On\n SSPIAuthoritative Off\n SSPIDomain <domaincontroller>\n SSPIOfferBasic On\n\n# Htpasswd Logins.\n AuthType Basic\n AuthBasicAuthoritative Off\n AuthUserFile passwd\n\n Require valid-user\n</Location>\n</screen>"
\r
1716 #: ../source/TortoiseGit_en.xml:2238
\r
1718 msgid "Securing the server with SSL"
\r
1721 #: ../source/TortoiseGit_en.xml:2240
\r
1726 #: ../source/TortoiseGit_en.xml:2242
\r
1728 msgid "Even though Apache 2.2.x has OpenSSL support, it is not activated by default. You need to activate this manually."
\r
1731 #: ../source/TortoiseGit_en.xml:2248
\r
1733 msgid "In the apache config file, uncomment the lines: <screen>\n#LoadModule ssl_module modules/mod_ssl.so\n</screen> and at the bottom <screen>\n#Include conf/extra/httpd-ssl.conf\n</screen> then change the line (on one line) <screen>\nSSLMutex \"file:C:/Program Files/Apache Software Foundation/\\\nApache2.2/logs/ssl_mutex\"\n</screen> to <screen>\nSSLMutex default\n</screen>"
\r
1736 #: ../source/TortoiseGit_en.xml:2270
\r
1738 msgid "Next you need to create an SSL certificate. To do that open a command prompt (DOS-Box) and change to the Apache folder (e.g. <filename>C:\\program files\\apache group\\apache2</filename>) and type the following command: <screen>\nbin\\openssl req -config conf\\openssl.cnf -new -out my-server.csr\n</screen> You will be asked for a passphrase. Please don't use simple words but whole sentences, e.g. a part of a poem. The longer the phrase the better. Also you have to enter the URL of your server. All other questions are optional but we recommend you fill those in too."
\r
1741 #: ../source/TortoiseGit_en.xml:2285
\r
1743 msgid "Normally the <filename>privkey.pem</filename> file is created automatically, but if it isn't you need to type this command to generate it: <screen>\nbin\\openssl genrsa -out conf\\privkey.pem 2048\n</screen>"
\r
1746 #: ../source/TortoiseGit_en.xml:2293
\r
1748 msgid "Next type the commands <screen>\nbin\\openssl rsa -in conf\\privkey.pem -out conf\\server.key\n</screen> and (on one line) <screen>\nbin\\openssl req -new -key conf\\server.key -out conf\\server.csr \\\n-config conf\\openssl.cnf\n</screen> and then (on one line) <screen>\nbin\\openssl x509 -in conf\\server.csr -out conf\\server.crt\n -req -signkey conf\\server.key -days 4000\n</screen> This will create a certificate which will expire in 4000 days. And finally enter (on one line): <screen>\nbin\\openssl x509 -in conf\\server.cert -out conf\\server.der.crt\n -outform DER\n</screen> These commands created some files in the Apache <filename>conf</filename> folder (<filename>server.der.crt</filename>, <filename>server.csr</filename>, <filename>server.key</filename>, <filename>.rnd</filename>, <filename>privkey.pem</filename>, <filename>server.cert</filename>)."
\r
1751 #: ../source/TortoiseGit_en.xml:2325
\r
1753 msgid "Restart the Apache service."
\r
1756 #: ../source/TortoiseGit_en.xml:2330
\r
1758 msgid "Point your browser to <systemitem class=\"url\">https://servername/svn/project</systemitem> ..."
\r
1761 #: ../source/TortoiseGit_en.xml:2338
\r
1763 msgid "SSL and Internet Explorer"
\r
1766 #: ../source/TortoiseGit_en.xml:2339
\r
1768 msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate."
\r
1771 #: ../source/TortoiseGit_en.xml:2353
\r
1773 msgid "define a separate <literal><Location /path></literal> directive in the Apache config file, and add the <literal>SSPIBasicPreferred On</literal>. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location."
\r
1776 #: ../source/TortoiseGit_en.xml:2363
\r
1778 msgid "Offer browsing with unencrypted authentication (without SSL) too. Strangely IE doesn't have any problems with authenticating if the connection is not secured with SSL."
\r
1781 #: ../source/TortoiseGit_en.xml:2371
\r
1783 msgid "In the SSL \"standard\" setup there's often the following statement in Apache's virtual SSL host: <screen>\nSetEnvIf User-Agent \".*MSIE.*\" \\\n nokeepalive ssl-unclean-shutdown \\\n downgrade-1.0 force-response-1.0\n</screen> There are (were?) good reasons for this configuration, see <ulink url=\"http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49\"><citetitle>http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49</citetitle></ulink> But if you want NTLM authentication you have to use <literal>keepalive</literal>. If You uncomment the whole <literal>SetEnvIf</literal> you should be able to authenticate IE with windows authentication over SSL against the Apache on Win32 with included <literal>mod_auth_sspi</literal>."
\r
1786 #: ../source/TortoiseGit_en.xml:2348
\r
1788 msgid "If you still want to use IE to browse the repository you can either: <placeholder-1/>"
\r
1791 #: ../source/TortoiseGit_en.xml:2394
\r
1793 msgid "Forcing SSL access"
\r
1796 #: ../source/TortoiseGit_en.xml:2395
\r
1798 msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <literal><Location></literal> block: <literal>SSLRequireSSL</literal>."
\r
1801 #: ../source/TortoiseGit_en.xml:2402
\r
1803 msgid "An example <literal><Location></literal> block would look like this: <screen>\n<Location /svn>\n DAV svn\n SVNParentPath D:\\SVN\n SSLRequireSSL\n AuthType Basic\n AuthName \"Git repositories\"\n AuthUserFile passwd\n #AuthzSVNAccessFile svnaccessfile\n Require valid-user\n</Location>\n</screen>"
\r
1806 #: ../source/TortoiseGit_en.xml:2420
\r
1808 msgid "Using client certificates with virtual SSL hosts"
\r
1811 #: ../source/TortoiseGit_en.xml:2421
\r
1813 msgid "Sent to the TortoiseGit mailing list by Nigel Green. Thanks!"
\r
1816 #: ../source/TortoiseGit_en.xml:2424
\r
1818 msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server."
\r
1821 #: ../source/TortoiseGit_en.xml:2430
\r
1823 msgid "Adding an <literal>SSLVerifyClient Optional</literal> directive to the <emphasis>per-server</emphasis> section of the Apache configuration (i.e. outside of any <literal>VirtualHost</literal> and <literal>Directory</literal> blocks) forces Apache to request a client Certificate in the initial SSL handshake. Due to a bug in <literal>mod_ssl</literal> it is essential that the certificate is requested at this point as it does not work if the SSL connection is re-negotiated."
\r
1826 #: ../source/TortoiseGit_en.xml:2440
\r
1828 msgid "The solution is to add the following directive to the virtual host directory that you want to lock down for Git: <screen>\nSSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n</screen> This directive grants access to the directory only if a client certificate was received and verified successfully."
\r
1831 #: ../source/TortoiseGit_en.xml:2449
\r
1833 msgid "To summarise, the relevant lines of the Apache configuration are: <screen>\nSSLVerifyClient Optional\n\n### Virtual host configuration for the PUBLIC host \n### (not requiring a certificate)\n\n<VirtualHost 127.0.0.1:443>\n <Directory \"pathtopublicfileroot\">\n </Directory>\n</VirtualHost>\n\n### Virtual host configuration for Git \n### (requiring a client certificate)\n<VirtualHost 127.0.0.1:443>\n <Directory \"Git host root path\">\n SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n </Directory>\n\n <Location /svn>\n DAV svn\n SVNParentPath /pathtorepository\n </Location>\n</VirtualHost>\n</screen>"
\r
1836 #: ../source/TortoiseGit_en.xml:2479
\r
1838 msgid "Svnserve Based Server"
\r
1841 #: ../source/TortoiseGit_en.xml:2485
\r
1843 msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection."
\r
1846 #: ../source/TortoiseGit_en.xml:2491
\r
1848 msgid "In most cases svnserve is easier to setup and runs faster than the Apache based server. And now that SASL support is included it is easy to secure as well."
\r
1851 #: ../source/TortoiseGit_en.xml:2498
\r
1853 msgid "Installing svnserve"
\r
1856 #: ../source/TortoiseGit_en.xml:2502
\r
1858 msgid "Get the latest version of Git from <ulink url=\"http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91\"><citetitle>http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91</citetitle></ulink>. Alternatively get a pre-packaged installer from CollabNet at <ulink url=\"http://www.collab.net/downloads/Git\"><citetitle>http://www.collab.net/downloads/Git</citetitle></ulink>. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security."
\r
1861 #: ../source/TortoiseGit_en.xml:2516
\r
1863 msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing."
\r
1866 #: ../source/TortoiseGit_en.xml:2522
\r
1868 msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4."
\r
1871 #: ../source/TortoiseGit_en.xml:2528
\r
1873 msgid "Open the windows-explorer, go to the installation directory of Git (usually <filename>C:\\Program Files\\Git</filename>) and in the <filename>bin</filename> directory, find the files <filename>svnserve.exe</filename>, <filename>intl3_svn.dll</filename>, <filename>libapr.dll</filename>, <filename>libapriconv.dll</filename>, <filename>libapriutil.dll</filename>, <filename>libdb*.dll</filename>, <filename>libeay32.dll</filename> and <filename>ssleay32.dll</filename> - copy these files, or just copy all of the <filename>bin</filename> directory, into a directory on your server e.g. <filename>c:\\svnserve</filename>"
\r
1876 #: ../source/TortoiseGit_en.xml:2550
\r
1878 msgid "Running svnserve"
\r
1881 #: ../source/TortoiseGit_en.xml:2551
\r
1883 msgid "Now that svnserve is installed, you need it running on your server. The simplest approach is to run the following from a DOS shell or create a windows shortcut: <screen>\nsvnserve.exe --daemon\n</screen> svnserve will now start waiting for incoming requests on port 3690. The --daemon switch tells svnserve to run as a daemon process, so it will always exist until it is manually terminated."
\r
1886 #: ../source/TortoiseGit_en.xml:2562
\r
1888 msgid "If you have not yet created a repository, follow the instructions given with the Apache server setup <xref linkend=\"tsvn-serversetup-apache-4\"/>."
\r
1891 #: ../source/TortoiseGit_en.xml:2567
\r
1893 msgid "To test that svnserve is working, use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Repo-Browser</guimenuitem></menuchoice> to view a repository."
\r
1896 #: ../source/TortoiseGit_en.xml:2575
\r
1898 msgid "Assuming your repository is located in <filename>c:\\repos\\TestRepo</filename>, and your server is called <filename>localhost</filename>, enter: <screen>\nsvn://localhost/repos/TestRepo\n</screen> when prompted by the repo browser."
\r
1901 #: ../source/TortoiseGit_en.xml:2584
\r
1903 msgid "You can also increase security and save time entering URLs with svnserve by using the --root switch to set the root location and restrict access to a specified directory on the server: <screen>\nsvnserve.exe --daemon --root drive:\\path\\to\\repository\\root\n</screen> Using the previous test as a guide, svnserve would now run as: <screen>\nsvnserve.exe --daemon --root c:\\repos\n</screen> And in TortoiseGit our repo-browser URL is now shortened to: <screen>\nsvn://localhost/TestRepo\n</screen> Note that the --root switch is also needed if your repository is located on a different partition or drive than the location of svnserve on your server."
\r
1906 #: ../source/TortoiseGit_en.xml:2603
\r
1908 msgid "Svnserve will service any number of repositories. Just locate them somewhere below the root folder you just defined, and access them using a URL relative to that root."
\r
1911 #: ../source/TortoiseGit_en.xml:2620
\r
1913 msgid "Run svnserve as a Service"
\r
1916 #: ../source/TortoiseGit_en.xml:2624
\r
1918 msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service."
\r
1921 #: ../source/TortoiseGit_en.xml:2631
\r
1923 msgid "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. <screen>\nsc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n --root c:\\repos\" displayname= \"Git\" depend= tcpip \n start= auto\n</screen> If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: <screen>\nsc create svnserve binpath= \"\n \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n --service --root c:\\repos\" displayname= \"Git\" \n depend= tcpip start= auto\n</screen> You can also add a description after creating the service. This will show up in the Windows Services Manager. <screen>\nsc description svnserve \"Git server (svnserve)\"\n</screen>"
\r
1926 #: ../source/TortoiseGit_en.xml:2654
\r
1928 msgid "Note the rather unusual command line format used by <literal>sc</literal>. In the <literal>key= value</literal> pairs there must be no space between the key and the <literal>=</literal> but there must be a space before the value."
\r
1931 #: ../source/TortoiseGit_en.xml:2661
\r
1933 msgid "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to <ulink url=\"http://www.microsoft.com/technet/security/topics/serversecurity/serviceaccount/default.mspx\"><citetitle>The Services and Service Accounts Security Planning Guide</citetitle></ulink>. To create the service under the Local Service account, append the following to the example above. <screen>\nobj= \"NT AUTHORITY\\LocalService\"\n</screen> Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"."
\r
1936 #: ../source/TortoiseGit_en.xml:2678
\r
1938 msgid "Once you have installed the service, you need to go to the services manager to start it (this time only; it will start automatically when the server reboots)."
\r
1941 #: ../source/TortoiseGit_en.xml:2683
\r
1943 msgid "For more detailed information, refer to <ulink url=\"http://svn.collab.net/repos/svn/trunk/notes/windows-service.txt\"><citetitle>Windows Service Support for Svnserve</citetitle></ulink>."
\r
1946 #: ../source/TortoiseGit_en.xml:2689
\r
1948 msgid "If you installed an earlier version of svnserve using the <literal>SVNService</literal> wrapper, and you now want to use the native support instead, you will need to unregister the wrapper as a service (remember to stop the service first!). Simply use the command <screen>\nsvnservice -remove\n</screen> to remove the service registry entry."
\r
1951 #: ../source/TortoiseGit_en.xml:2703
\r
1953 msgid "Basic Authentication with svnserve"
\r
1956 #: ../source/TortoiseGit_en.xml:2704
\r
1958 msgid "The default svnserve setup provides anonymous read-only access. This means that you can use an <literal>svn://</literal> URL to checkout and update, or use the repo-browser in TortoiseGit to view the repository, but you won't be able to commit any changes."
\r
1961 #: ../source/TortoiseGit_en.xml:2710
\r
1963 msgid "To enable write access to a repository, you need to edit the <filename>conf/svnserve.conf</filename> file in your repository directory. This file controls the configuration of the svnserve daemon, and also contains useful documentation."
\r
1966 #: ../source/TortoiseGit_en.xml:2716
\r
1968 msgid "You can enable anonymous write access by simply setting: <screen>\n[general]\nanon-access = write\n</screen> However, you will not know who has made changes to a repository, as the <literal>svn:author</literal> property will be empty. You will also be unable to control who makes changes to a repository. This is a somewhat risky setup!"
\r
1971 #: ../source/TortoiseGit_en.xml:2727
\r
1973 msgid "One way to overcome this is to create a password database: <screen>\n[general]\nanon-access = none\nauth-access = write\npassword-db = userfile\n</screen> Where <filename>userfile</filename> is a file which exists in the same directory as <filename>svnserve.conf</filename>. This file can live elsewhere in your file system (useful for when you have multiple repositories which require the same access rights) and may be referenced using an absolute path, or a path relative to the <filename>conf</filename> directory. If you include a path, it must be written <filename>/the/unix/way</filename>. Using \\ or drive letters will not work. The <filename>userfile</filename> should have a structure of: <screen>\n[users]\nusername = password\n...\n</screen> This example would deny all access for unauthenticated (anonymous) users, and give read-write access to users listed in <filename>userfile</filename>."
\r
1976 #: ../source/TortoiseGit_en.xml:2755
\r
1978 msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.auth.users\"><citetitle>Create a 'users' file and realm</citetitle></ulink> and <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.serverconfig.netmodel.html#svn.serverconfig.netmodel.credcache\"><citetitle>Client Credentials Caching</citetitle></ulink>"
\r
1981 #: ../source/TortoiseGit_en.xml:2773
\r
1983 msgid "Better Security with SASL"
\r
1986 #: ../source/TortoiseGit_en.xml:2775
\r
1991 #: ../source/TortoiseGit_en.xml:2778
\r
1993 msgid "What is SASL?"
\r
1996 #: ../source/TortoiseGit_en.xml:2779
\r
1998 msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library."
\r
2001 #: ../source/TortoiseGit_en.xml:2787
\r
2003 msgid "For a more complete discussion of the options available, you should look at the Git book in the section <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.sasl\"><citetitle>Using svnserve with SASL</citetitle></ulink>. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on."
\r
2006 #: ../source/TortoiseGit_en.xml:2800
\r
2008 msgid "SASL Authentication"
\r
2011 #: ../source/TortoiseGit_en.xml:2801
\r
2013 msgid "To activate specific SASL mechanisms on the server, you'll need to do three things. First, create a <literal>[sasl]</literal> section in your repository's <filename>svnserve.conf</filename> file, with this key-value pair: <screen>\nuse-sasl = true\n</screen>"
\r
2016 #: ../source/TortoiseGit_en.xml:2810
\r
2018 msgid "Second, create a file called <filename>svn.conf</filename> in a convenient location - typically in the directory where Git is installed."
\r
2021 #: ../source/TortoiseGit_en.xml:2815
\r
2023 msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named <literal>[HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library]</literal> and place two new string values inside it: <literal>SearchPath</literal> set to the directory path containing the <filename>sasl*.dll</filename> plug-ins (normally in the Git install directory), and <literal>ConfFile</literal> set to the directory containing the <filename>svn.conf</filename> file. If you used the CollabNet installer, these registry keys will already have been created for you."
\r
2026 #: ../source/TortoiseGit_en.xml:2827
\r
2028 msgid "Edit the <filename>svn.conf</filename> file to contain the following: <screen>\npwcheck_method: auxprop\nauxprop_plugin: sasldb\nmech_list: DIGEST-MD5\nsasldb_path: C:\\TortoiseGit\\sasldb\n</screen> The last line shows the location of the authentication database, which is a file called <filename>sasldb</filename>. This could go anywhere, but a convenient choice is the repository parent path. Make sure that the svnserve service has read access to this file."
\r
2031 #: ../source/TortoiseGit_en.xml:2842
\r
2033 msgid "If svnserve was already running, you will need to restart it to ensure it reads the updated configuration."
\r
2036 #: ../source/TortoiseGit_en.xml:2846
\r
2038 msgid "Now that everything is set up, all you need to do is create some users and passwords. To do this you need the <literal>saslpasswd2</literal> program. If you used the CollabNet installer, that program will be in the install directory. Use a command something like this: <screen>\nsaslpasswd2 -c -f C:\\TortoiseGit\\sasldb -u realm username\n</screen> The <literal>-f</literal> switch gives the database location, <literal>realm</literal> must be the same as the value you defined in your repository's <filename>svnserve.conf</filename> file, and username is exactly what you expect it to be. Note that the realm is not allowed to contain space characters."
\r
2041 #: ../source/TortoiseGit_en.xml:2861
\r
2043 msgid "You can list the usernames stored in the database using the <literal>sasldblistusers2</literal> program."
\r
2046 #: ../source/TortoiseGit_en.xml:2867
\r
2048 msgid "SASL Encryption"
\r
2051 #: ../source/TortoiseGit_en.xml:2868
\r
2053 msgid "To enable or disable different levels of encryption, you can set two values in your repository's <filename>svnserve.conf</filename> file: <screen>\n[sasl]\nuse-sasl = true\nmin-encryption = 128\nmax-encryption = 256\n</screen>"
\r
2056 #: ../source/TortoiseGit_en.xml:2879
\r
2058 msgid "The <literal>min-encryption</literal> and <literal>max-encryption</literal> variables control the level of encryption demanded by the server. To disable encryption completely, set both values to 0. To enable simple checksumming of data (i.e., prevent tampering and guarantee data integrity without encryption), set both values to 1. If you wish to allow (but not require) encryption, set the minimum value to 0, and the maximum value to some bit-length. To require encryption unconditionally, set both values to numbers greater than 1. In our previous example, we require clients to do at least 128-bit encryption, but no more than 256-bit encryption."
\r
2061 #: ../source/TortoiseGit_en.xml:2896
\r
2063 msgid "Authentication with svn+ssh"
\r
2066 #: ../source/TortoiseGit_en.xml:2897
\r
2068 msgid "Another way to authenticate users with a svnserve based server is to use a secure shell (SSH) to tunnel requests through. It is not as simple to set up as SASL, but it may be useful is some cases."
\r
2071 #: ../source/TortoiseGit_en.xml:2903
\r
2073 msgid "With this approach, svnserve is not run as a daemon process, rather, the secure shell starts svnserve for you, running it as the SSH authenticated user. To enable this, you need a secure shell daemon on your server."
\r
2076 #: ../source/TortoiseGit_en.xml:2909
\r
2078 msgid "A basic method for setting up your server is given in <xref linkend=\"tsvn-ssh-howto\"/>. You can find other SSH topics within the FAQ by searching for <quote>SSH</quote>."
\r
2081 #: ../source/TortoiseGit_en.xml:2915
\r
2083 msgid "Further information about svnserve can be found in the <ulink url=\"http://svnbook.red-bean.com\"><citetitle>Version Control with Git</citetitle></ulink>."
\r
2086 #: ../source/TortoiseGit_en.xml:2923
\r
2088 msgid "Path-based Authorization with svnserve"
\r
2091 #: ../source/TortoiseGit_en.xml:2924
\r
2093 msgid "Starting with Git 1.3, svnserve supports the same <literal>mod_authz_svn</literal> path-based authorization scheme that is available with the Apache server. You need to edit the <filename>conf/svnserve.conf</filename> file in your repository directory and add a line referring to your authorization file. <screen>\n[general]\nauthz-db = authz\n</screen> Here, <filename>authz</filename> is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read <xref linkend=\"tsvn-serversetup-mod_authz_svn\"/> for a description of the file format."
\r
2096 #: ../source/TortoiseGit_en.xml:2946
\r
2098 msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit."
\r
2101 #: ../source/TortoiseGit_en.xml:2951
\r
2103 msgid "If you haven't created a Git repository yet, it's time to do that now."
\r
2106 #: ../source/TortoiseGit_en.xml:2959
\r
2108 msgid "Repository Creation"
\r
2111 #: ../source/TortoiseGit_en.xml:2961
\r
2113 msgid "create repository"
\r
2116 #: ../source/TortoiseGit_en.xml:2963
\r
2118 msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.reposadmin.planning.html#svn.reposadmin.basics.backends\"><citetitle>Choosing a Data Store</citetitle></ulink> in the Git book for more information."
\r
2121 #: ../source/TortoiseGit_en.xml:2978
\r
2123 msgid "Creating a Repository with the Command Line Client"
\r
2126 #: ../source/TortoiseGit_en.xml:2980
\r
2128 #: ../source/TortoiseGit_en.xml:3021
\r
2133 #: ../source/TortoiseGit_en.xml:2981
\r
2135 msgid "Command Line Client"
\r
2138 #: ../source/TortoiseGit_en.xml:2985
\r
2140 msgid "Create an empty folder with the name SVN (e.g. <filename>D:\\SVN\\</filename>), which is used as root for all your repositories."
\r
2143 #: ../source/TortoiseGit_en.xml:2992
\r
2145 msgid "Create another folder <filename>MyNewRepository</filename> inside <filename>D:\\SVN\\</filename>."
\r
2148 #: ../source/TortoiseGit_en.xml:2999
\r
2150 msgid "Open the command prompt (or DOS-Box), change into <filename>D:\\SVN\\</filename> and type <screen>\nsvnadmin create --fs-type bdb MyNewRepository\n</screen> or <screen>\nsvnadmin create --fs-type fsfs MyNewRepository\n</screen>"
\r
2153 #: ../source/TortoiseGit_en.xml:3012
\r
2155 msgid "Now you've got a new repository located at <filename>D:\\SVN\\MyNewRepository</filename>."
\r
2158 #: ../source/TortoiseGit_en.xml:3019
\r
2160 msgid "Creating The Repository With TortoiseGit"
\r
2163 #: ../source/TortoiseGit_en.xml:3026
\r
2165 msgid "The TortoiseGit menu for unversioned folders"
\r
2168 #: ../source/TortoiseGit_en.xml:3031
\r
2170 msgid "Open the windows explorer"
\r
2173 #: ../source/TortoiseGit_en.xml:3036
\r
2175 msgid "Create a new folder and name it e.g. <filename>SVNRepository</filename>"
\r
2178 #: ../source/TortoiseGit_en.xml:3042
\r
2180 msgid "<action>Right-click</action> on the newly created folder and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Create Repository here...</guimenuitem></menuchoice>."
\r
2183 #: ../source/TortoiseGit_en.xml:3050
\r
2185 msgid "A repository is then created inside the new folder. <emphasis>Don't edit those files yourself!!!</emphasis>. If you get any errors make sure that the folder is empty and not write protected."
\r
2188 #: ../source/TortoiseGit_en.xml:3059
\r
2190 msgid "TortoiseGit no longer offers the option to create BDB repositories, although you can still use the command line client to create them. FSFS repositories are generally easier for you to maintain, and also makes it easier for us to maintain TortoiseGit due to compatibility issues between the different BDB versions."
\r
2193 #: ../source/TortoiseGit_en.xml:3066
\r
2195 msgid "Future versions of TortoiseGit will not support <literal>file://</literal> access to BDB repositories due to these compatibility issues, although it will of course always support this repository format when accessed via a server through the <literal>svn://</literal>, <literal>http://</literal> or <literal>https://</literal> protocols. For this reason, we strongly recommend that any new repository which must be accessed using <literal>file://</literal> protocol is created as FSFS."
\r
2198 #: ../source/TortoiseGit_en.xml:3078
\r
2200 msgid "Of course we also recommend that you don't use <literal>file://</literal> access at all, apart from local testing purposes. Using a server is more secure and more reliable for all but single-developer use."
\r
2203 #: ../source/TortoiseGit_en.xml:3087
\r
2205 msgid "Local Access to the Repository"
\r
2208 #: ../source/TortoiseGit_en.xml:3089
\r
2213 #: ../source/TortoiseGit_en.xml:3092
\r
2218 #: ../source/TortoiseGit_en.xml:3094
\r
2220 msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form <systemitem class=\"url\">file:///C:/SVNRepository/</systemitem>. Note the use of forward slashes throughout."
\r
2223 #: ../source/TortoiseGit_en.xml:3100
\r
2225 msgid "To access a repository located on a network share you can either use drive mapping, or you can use the UNC path. For UNC paths, the form is <systemitem class=\"url\">file://ServerName/path/to/repos/</systemitem>. Note that there are only 2 leading slashes here."
\r
2228 #: ../source/TortoiseGit_en.xml:3107
\r
2230 msgid "Prior to SVN 1.2, UNC paths had to be given in the more obscure form <systemitem class=\"url\">file:///\\ServerName/path/to/repos</systemitem>. This form is still supported, but not recommended."
\r
2233 #: ../source/TortoiseGit_en.xml:3114
\r
2235 msgid "Do not create or access a Berkeley DB repository on a network share. It <emphasis>cannot</emphasis> exist on a remote file system. Not even if you have the network drive mapped to a drive letter. If you attempt to use Berkeley DB on a network share, the results are unpredictable - you may see mysterious errors right away, or it may be months before you discover that your repository database is subtly corrupted."
\r
2238 #: ../source/TortoiseGit_en.xml:3125
\r
2240 msgid "Accessing a Repository on a Network Share"
\r
2243 #: ../source/TortoiseGit_en.xml:3127
\r
2245 msgid "Network share"
\r
2248 #: ../source/TortoiseGit_en.xml:3129
\r
2250 msgid "Although in theory it is possible to put a FSFS repository on a network share and have multiple users access it using <literal>file://</literal> protocol, this is most definitely <emphasis>not</emphasis> recommended. In fact we would <emphasis>strongly</emphasis> discourage it, and do not support such use."
\r
2253 #: ../source/TortoiseGit_en.xml:3136
\r
2255 msgid "Firstly you are giving every user direct write access to the repository, so any user could accidentally delete the entire repository or make it unusable in some other way."
\r
2258 #: ../source/TortoiseGit_en.xml:3141
\r
2260 msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time."
\r
2263 #: ../source/TortoiseGit_en.xml:3147
\r
2265 msgid "Thirdly the file permissions have to be set just so. You may just about get away with it on a native Windows share, but SAMBA is particularly difficult."
\r
2268 #: ../source/TortoiseGit_en.xml:3152
\r
2270 msgid "<literal>file://</literal> access is intended for local, single-user access only, particularly testing and debugging. When you want to share the repository you <emphasis>really</emphasis> need to set up a proper server, and it is not nearly as difficult as you might think. Read <xref linkend=\"tsvn-serversetup\"/> for guidelines on choosing and setting up a server."
\r
2273 #: ../source/TortoiseGit_en.xml:3162
\r
2275 msgid "Repository Layout"
\r
2278 #: ../source/TortoiseGit_en.xml:3163
\r
2280 msgid "Before you import your data into the repository you should first think about how you want to organize your data. If you use one of the recommended layouts you will later have it much easier."
\r
2283 #: ../source/TortoiseGit_en.xml:3169
\r
2285 msgid "There are some standard, recommended ways to organize a repository. Most people create a <filename>trunk</filename> directory to hold the <quote>main line</quote> of development, a <filename>branches</filename> directory to contain branch copies, and a <filename>tags</filename> directory to contain tag copies. If a repository holds only one project, then often people create these top-level directories:"
\r
2288 #: ../source/TortoiseGit_en.xml:3178
\r
2291 msgid "\n/trunk\n/branches\n/tags\n"
\r
2294 #: ../source/TortoiseGit_en.xml:3183
\r
2296 msgid "If a repository contains multiple projects, people often index their layout by branch:"
\r
2299 #: ../source/TortoiseGit_en.xml:3187
\r
2302 msgid "\n/trunk/paint\n/trunk/calc\n/branches/paint\n/branches/calc\n/tags/paint\n/tags/calc\n"
\r
2305 #: ../source/TortoiseGit_en.xml:3195
\r
2307 msgid "...or by project:"
\r
2310 #: ../source/TortoiseGit_en.xml:3198
\r
2313 msgid "\n/paint/trunk\n/paint/branches\n/paint/tags\n/calc/trunk\n/calc/branches\n/calc/tags\n"
\r
2316 #: ../source/TortoiseGit_en.xml:3206
\r
2318 msgid "Indexing by project makes sense if the projects are not closely related and each one is checked out individually. For related projects where you may want to check out all projects in one go, or where the projects are all tied together in a single distribution package, it is often better to index by branch. This way you have only one trunk to checkout, and the relationships between the sub-projects is more easily visible."
\r
2321 #: ../source/TortoiseGit_en.xml:3214
\r
2323 msgid "If you adopt a top level <filename>/trunk /tags /branches</filename> approach, there is nothing to say that you have to copy the entire trunk for every branch and tag, and in some ways this structure offers the most flexibility."
\r
2326 #: ../source/TortoiseGit_en.xml:3220
\r
2328 msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers."
\r
2331 #: ../source/TortoiseGit_en.xml:3230
\r
2333 msgid "Of course, you're free to ignore these common layouts. You can create any sort of variation, whatever works best for you or your team. Remember that whatever you choose, it's not a permanent commitment. You can reorganize your repository at any time. Because branches and tags are ordinary directories, TortoiseGit can move or rename them however you wish."
\r
2336 #: ../source/TortoiseGit_en.xml:3238
\r
2338 msgid "Switching from one layout to another is just a matter of issuing a series of server-side moves; If you don't like the way things are organized in the repository, just juggle the directories around."
\r
2341 #: ../source/TortoiseGit_en.xml:3255
\r
2343 msgid "create a new empty folder on your hard drive"
\r
2346 #: ../source/TortoiseGit_en.xml:3260
\r
2348 msgid "create your desired top-level folder structure inside that folder - don't put any files in it yet!"
\r
2351 #: ../source/TortoiseGit_en.xml:3266
\r
2353 msgid "import this structure into the repository via a <action>right click</action> on the folder and selecting <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Import...</guimenuitem></menuchoice> This will import your temp folder into the repository root to create the basic repository layout."
\r
2356 #: ../source/TortoiseGit_en.xml:3244
\r
2358 msgid "So if you haven't already created a basic folder structure inside your repository you should do that now. There are two ways to achieve this. If you simply want to create a <filename>/trunk /tags /branches</filename> structure, you can use the repository browser to create the three folders (in three separate commits). If you want to create a deeper hierarchy then it is simpler to create a folder structure on disk first and import it in a single commit, like this: <placeholder-1/>"
\r
2361 #: ../source/TortoiseGit_en.xml:3281
\r
2363 msgid "Note that the name of the folder you are importing does not appear in the repository, only its contents. For example, create the following folder structure: <screen>\nC:\\Temp\\New\\trunk\nC:\\Temp\\New\\branches\nC:\\Temp\\New\\tags\n</screen> Import <filename>C:\\Temp\\New</filename> into the repository root, which will then look like this: <screen>\n/trunk\n/branches\n/tags\n</screen>"
\r
2366 #: ../source/TortoiseGit_en.xml:3301
\r
2368 msgid "Repository Backup"
\r
2371 #: ../source/TortoiseGit_en.xml:3303
\r
2376 #: ../source/TortoiseGit_en.xml:3305
\r
2378 msgid "Whichever type of repository you use, it is vitally important that you maintain regular backups, and that you verify the backup. If the server fails, you may be able to access a recent version of your files, but without the repository all your history is lost forever."
\r
2381 #: ../source/TortoiseGit_en.xml:3312
\r
2383 msgid "The simplest (but not recommended) way is just to copy the repository folder onto the backup medium. However, you have to be absolutely sure that no process is accessing the data. In this context, access means <emphasis>any</emphasis> access at all. A BDB repository is written to even when the operation only appears to require reading, such as getting status. If your repository is accessed at all during the copy, (web browser left open, WebSVN, etc.) the backup will be worthless."
\r
2386 #: ../source/TortoiseGit_en.xml:3322
\r
2388 msgid "The recommended method is to run <screen>\nsvnadmin hotcopy path/to/repository path/to/backup --clean-logs\n</screen> to create a copy of your repository in a safe manner. Then backup the copy. The <literal>--clean-logs</literal> option is not required, but removes any redundant log files when you backup a BDB repository, which may save some space."
\r
2391 #: ../source/TortoiseGit_en.xml:3332
\r
2393 msgid "The <literal>svnadmin</literal> tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the <filename>.zip</filename> version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from <ulink url=\"http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91\"><citetitle>http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91</citetitle></ulink>."
\r
2396 #: ../source/TortoiseGit_en.xml:3347
\r
2398 msgid "Server side hook scripts"
\r
2401 #: ../source/TortoiseGit_en.xml:3349
\r
2406 #: ../source/TortoiseGit_en.xml:3352
\r
2408 #: ../source/TortoiseGit_en.xml:12457
\r
2410 msgid "hook scripts"
\r
2413 #: ../source/TortoiseGit_en.xml:3355
\r
2415 msgid "server side hook scripts"
\r
2418 #: ../source/TortoiseGit_en.xml:3357
\r
2420 msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.reposadmin.create.html#svn.reposadmin.create.hooks\"><citetitle>Hook Scripts</citetitle></ulink> in the Git Book for full details about the hooks which are implemented."
\r
2423 #: ../source/TortoiseGit_en.xml:3372
\r
2425 msgid "These hook scripts are executed by the server that hosts the repository. TortoiseGit also allows you to configure client side hook scripts that are executed locally upon certain events. See <xref linkend=\"tsvn-dug-settings-hooks\"/> for more information."
\r
2428 #: ../source/TortoiseGit_en.xml:3378
\r
2430 msgid "Sample hook scripts can be found in the <filename>hooks</filename> directory of the repository. These sample scripts are suitable for Unix/Linux servers but need to be modified if your server is Windows based. The hook can be a batch file or an executable. The sample below shows a batch file which might be used to implement a pre-revprop-change hook. <screen>\nrem Only allow log messages to be changed.\nif \"%4\" == \"svn:log\" exit 0\necho Property '%4' cannot be changed >&2\nexit 1\n</screen> Note that anything sent to stdout is discarded. if you want a message to appear in the Commit Reject dialog you must send it to stderr. In a batch file this is achieved using <filename>>&2</filename>"
\r
2433 #: ../source/TortoiseGit_en.xml:3398
\r
2435 msgid "Checkout Links"
\r
2438 #: ../source/TortoiseGit_en.xml:3400
\r
2440 msgid "checkout link"
\r
2443 #: ../source/TortoiseGit_en.xml:3403
\r
2445 msgid "TortoiseGit link"
\r
2448 #: ../source/TortoiseGit_en.xml:3406
\r
2453 #: ../source/TortoiseGit_en.xml:3409
\r
2458 #: ../source/TortoiseGit_en.xml:3411
\r
2460 msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a <firstterm>checkout link</firstterm> for other TortoiseGit users."
\r
2463 #: ../source/TortoiseGit_en.xml:3417
\r
2465 msgid "When you install TortoiseGit, it registers a new <literal>tsvn:</literal> protocol. When a TortoiseGit user clicks on such a link, the checkout dialog will open automatically with the repository URL already filled in."
\r
2468 #: ../source/TortoiseGit_en.xml:3426
\r
2469 #.(programlisting)
\r
2471 msgid "\n<a href=\"tsvn:http://project.domain.org/svn/trunk\">\n</a>\n"
\r
2474 #: ../source/TortoiseGit_en.xml:3423
\r
2476 msgid "To include such a link in your own html page, you need to add code which looks something like this: <placeholder-1/>"
\r
2479 #: ../source/TortoiseGit_en.xml:3438
\r
2480 #.(programlisting)
\r
2482 msgid "\n<a href=\"tsvn:http://project.domain.org/svn/trunk\">\n<img src=TortoiseCheckout.png></a>\n"
\r
2485 #: ../source/TortoiseGit_en.xml:3431
\r
2487 msgid "Of course it would look even better if you included a suitable picture. You can use the <ulink url=\"http://TortoiseGit.tigris.org/images/TortoiseCheckout.png\"><citetitle>TortoiseGit logo</citetitle></ulink> or you can provide your own image. <placeholder-1/>"
\r
2490 #: ../source/TortoiseGit_en.xml:3445
\r
2491 #.(programlisting)
\r
2493 msgid "\n<a href=\"tsvn:http://project.domain.org/svn/trunk?100\">\n</a>\n"
\r
2496 #: ../source/TortoiseGit_en.xml:3443
\r
2498 msgid "You can also make the link point to a specific revision, for example <placeholder-1/>"
\r
2501 #: ../source/TortoiseGit_en.xml:3453
\r
2503 msgid "Daily Use Guide"
\r
2506 #: ../source/TortoiseGit_en.xml:3457
\r
2508 msgid "This document describes day to day usage of the TortoiseGit client. It is <emphasis>not</emphasis> an introduction to version control systems, and <emphasis>not</emphasis> an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it."
\r
2511 #: ../source/TortoiseGit_en.xml:3465
\r
2513 msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: <ulink url=\"http://svnbook.red-bean.com/\"><citetitle>Version Control with Git</citetitle></ulink>."
\r
2516 #: ../source/TortoiseGit_en.xml:3472
\r
2518 msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time."
\r
2521 #: ../source/TortoiseGit_en.xml:3484
\r
2523 msgid "You should have installed TortoiseGit already."
\r
2526 #: ../source/TortoiseGit_en.xml:3489
\r
2528 msgid "You should be familiar with version control systems."
\r
2531 #: ../source/TortoiseGit_en.xml:3494
\r
2533 msgid "You should know the basics of Git."
\r
2536 #: ../source/TortoiseGit_en.xml:3499
\r
2538 msgid "You should have set up a server and/or have access to a Git repository."
\r
2541 #: ../source/TortoiseGit_en.xml:3480
\r
2543 msgid "In order to get the most out of the Daily Use Guide: <placeholder-1/>"
\r
2546 #: ../source/TortoiseGit_en.xml:3510
\r
2548 msgid "Getting Started"
\r
2551 #: ../source/TortoiseGit_en.xml:3512
\r
2553 #: ../source/TortoiseGit_en.xml:5038
\r
2555 #: ../source/TortoiseGit_en.xml:15663
\r
2557 msgid "Icon Overlays"
\r
2560 #: ../source/TortoiseGit_en.xml:3515
\r
2562 #: ../source/TortoiseGit_en.xml:5047
\r
2564 msgid "Explorer showing icon overlays"
\r
2567 #: ../source/TortoiseGit_en.xml:3513
\r
2569 msgid "<placeholder-1/> One of the most visible features of TortoiseGit is the icon overlays which appear on files in your working copy. These show you at a glance which of your files have been modified. Refer to <xref linkend=\"tsvn-dug-wcstatus-1\"/> to find out what the different overlays represent."
\r
2572 #: ../source/TortoiseGit_en.xml:3526
\r
2574 msgid "Context Menus"
\r
2577 #: ../source/TortoiseGit_en.xml:3528
\r
2579 msgid "context menu"
\r
2582 #: ../source/TortoiseGit_en.xml:3531
\r
2584 msgid "right-click"
\r
2587 #: ../source/TortoiseGit_en.xml:3535
\r
2589 msgid "Context menu for a directory under version control"
\r
2592 #: ../source/TortoiseGit_en.xml:3533
\r
2594 msgid "<placeholder-1/> All TortoiseGit commands are invoked from the context menu of the windows explorer. Most are directly visible, when you <action>right click</action> on a file or folder. The commands that are available depend on whether the file or folder or its parent folder is under version control or not. You can also see the TortoiseGit menu as part of the Explorer file menu."
\r
2597 #: ../source/TortoiseGit_en.xml:3545
\r
2599 msgid "Some commands which are very rarely used are only available in the extended context menu. To bring up the extended context menu, hold down the <keycap>Shift</keycap> key when you <action>right-click</action>."
\r
2602 #: ../source/TortoiseGit_en.xml:3554
\r
2604 msgid "Explorer file menu for a shortcut in a versioned folder"
\r
2607 #: ../source/TortoiseGit_en.xml:3551
\r
2609 msgid "In some cases you may see several TortoiseGit entries. This is not a bug! <placeholder-1/> This example is for an unversioned shortcut within a versioned folder, and in the Explorer file menu there are <emphasis>three</emphasis> entries for TortoiseGit. One is for the folder, one for the shortcut itself, and the third for the object the shortcut is pointing to. To help you distinguish between them, the icons have an indicator in the lower right corner to show whether the menu entry is for a file, a folder, a shortcut or for multiple selected items."
\r
2612 #: ../source/TortoiseGit_en.xml:3565
\r
2614 msgid "If you are using Windows 2000 you will find that the context menus are shown as plain text, without the menu icons shown above. We are aware that this was working in previous versions, but Microsoft has changed the way its icon handlers work for Vista, requiring us to use a different display method which unfortunately does not work on Windows 2000."
\r
2617 #: ../source/TortoiseGit_en.xml:3574
\r
2619 #: ../source/TortoiseGit_en.xml:4505
\r
2621 msgid "Drag and Drop"
\r
2624 #: ../source/TortoiseGit_en.xml:3576
\r
2626 msgid "drag handler"
\r
2629 #: ../source/TortoiseGit_en.xml:3579
\r
2631 msgid "drag-n-drop"
\r
2634 #: ../source/TortoiseGit_en.xml:3582
\r
2636 msgid "right drag"
\r
2639 #: ../source/TortoiseGit_en.xml:3586
\r
2641 #: ../source/TortoiseGit_en.xml:6867
\r
2643 msgid "Right drag menu for a directory under version control"
\r
2646 #: ../source/TortoiseGit_en.xml:3584
\r
2648 msgid "<placeholder-1/> Other commands are available as drag handlers, when you <action>right drag</action> files or folders to a new location inside working copies or when you <action>right drag</action> a non-versioned file or folder into a directory which is under version control."
\r
2651 #: ../source/TortoiseGit_en.xml:3596
\r
2653 msgid "Common Shortcuts"
\r
2656 #: ../source/TortoiseGit_en.xml:3603
\r
2661 #: ../source/TortoiseGit_en.xml:3605
\r
2663 msgid "Help, of course."
\r
2666 #: ../source/TortoiseGit_en.xml:3611
\r
2671 #: ../source/TortoiseGit_en.xml:3613
\r
2673 msgid "Refresh the current view. This is perhaps the single most useful one-key command. For example ... In Explorer this will refresh the icon overlays on your working copy. In the commit dialog it will re-scan the working copy to see what may need to be committed. In the Revision Log dialog it will contact the repository again to check for more recent changes."
\r
2676 #: ../source/TortoiseGit_en.xml:3625
\r
2681 #: ../source/TortoiseGit_en.xml:3627
\r
2683 msgid "Select all. This can be used if you get an error message and want to copy and paste into an email. Use Ctrl-A to select the error message and then ..."
\r
2686 #: ../source/TortoiseGit_en.xml:3635
\r
2691 #: ../source/TortoiseGit_en.xml:3637
\r
2693 msgid "... Copy the selected text."
\r
2696 #: ../source/TortoiseGit_en.xml:3597
\r
2698 msgid "Some common operations have well-known Windows shortcuts, but do not appear on buttons or in menus. If you can't work out how to do something obvious, like refreshing a view, check here. <placeholder-1/>"
\r
2701 #: ../source/TortoiseGit_en.xml:3648
\r
2703 msgid "authentication"
\r
2706 #: ../source/TortoiseGit_en.xml:3654
\r
2708 msgid "Authentication Dialog"
\r
2711 #: ../source/TortoiseGit_en.xml:3662
\r
2713 msgid "<filename>svn.simple</filename> contains credentials for basic authentication (username/password)."
\r
2716 #: ../source/TortoiseGit_en.xml:3668
\r
2718 msgid "<filename>svn.ssl.server</filename> contains SSL server certificates."
\r
2721 #: ../source/TortoiseGit_en.xml:3674
\r
2723 msgid "<filename>svn.username</filename> contains credentials for username-only authentication (no password needed)."
\r
2726 #: ../source/TortoiseGit_en.xml:3650
\r
2728 msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. <placeholder-1/> Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: <filename>%APPDATA%\\Git\\auth</filename> in three subdirectories: <placeholder-2/>"
\r
2731 #: ../source/TortoiseGit_en.xml:3681
\r
2733 msgid "If you want to clear the authentication cache for all servers, you can do so from the <guilabel>Saved Data</guilabel> page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git <filename>auth</filename> directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to <xref linkend=\"tsvn-dug-settings-saved-data\"/>."
\r
2736 #: ../source/TortoiseGit_en.xml:3690
\r
2738 msgid "For more information on how to set up your server for authentication and access control, refer to <xref linkend=\"tsvn-serversetup\"/>"
\r
2741 #: ../source/TortoiseGit_en.xml:3697
\r
2743 msgid "Maximizing Windows"
\r
2746 #: ../source/TortoiseGit_en.xml:3699
\r
2751 #: ../source/TortoiseGit_en.xml:3701
\r
2753 msgid "Many of TortoiseGit's dialogs have a lot of information to display, but it is often useful to maximize only the height, or only the width, rather than maximizing to fill the screen. As a convenience, there are shortcuts for this on the <guilabel>Maximize</guilabel> button. Use the <action>middle mouse</action> button to maximize vertically, and <action>right mouse</action> to maximize horizontally."
\r
2756 #: ../source/TortoiseGit_en.xml:3712
\r
2758 msgid "Importing Data Into A Repository"
\r
2761 #: ../source/TortoiseGit_en.xml:3714
\r
2766 #: ../source/TortoiseGit_en.xml:3720
\r
2768 msgid "add files to repository"
\r
2771 #: ../source/TortoiseGit_en.xml:3724
\r
2773 #: ../source/TortoiseGit_en.xml:14432
\r
2775 #: ../source/TortoiseGit_en.xml:15594
\r
2777 #: ../source/TortoiseGit_en.xml:16361
\r
2782 #: ../source/TortoiseGit_en.xml:3726
\r
2784 msgid "temporary files"
\r
2787 #: ../source/TortoiseGit_en.xml:3728
\r
2789 msgid "If you are importing into an existing repository which already contains some projects, then the repository structure will already have been decided. If are importing data into a new repository then it is worth taking the time to think about how it will be organised. Read <xref linkend=\"tsvn-repository-layout\"/> for further advice."
\r
2792 #: ../source/TortoiseGit_en.xml:3742
\r
2794 msgid "There is no way to select files and folders to include, aside from using the global ignore settings."
\r
2797 #: ../source/TortoiseGit_en.xml:3748
\r
2799 msgid "The folder imported does not become a working copy. You have to do a checkout to copy the files back from the server."
\r
2802 #: ../source/TortoiseGit_en.xml:3754
\r
2804 msgid "It is easy to import to the wrong folder level in the repository."
\r
2807 #: ../source/TortoiseGit_en.xml:3736
\r
2809 msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: <placeholder-1/> For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in <xref linkend=\"tsvn-dug-import-in-place\"/>. But since you are here, this is how the basic import works ..."
\r
2812 #: ../source/TortoiseGit_en.xml:3768
\r
2814 msgid "Remove all files which are not needed to build the project (temporary files, files which are generated by a compiler e.g. *.obj, compiled binaries, ...)"
\r
2817 #: ../source/TortoiseGit_en.xml:3776
\r
2819 msgid "Organize the files in folders and sub-folders. Although it is possible to rename/move files later it is highly recommended to get your project's structure straight before importing!"
\r
2822 #: ../source/TortoiseGit_en.xml:3764
\r
2824 msgid "Before you import your project into a repository you should: <placeholder-1/>"
\r
2827 #: ../source/TortoiseGit_en.xml:3796
\r
2829 msgid "The Import dialog"
\r
2832 #: ../source/TortoiseGit_en.xml:3785
\r
2834 msgid "Now select the top-level folder of your project directory structure in the windows explorer and <action>right click</action> to open the context menu. Select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Import...</guimenuitem></menuchoice> which brings up a dialog box: <placeholder-1/>"
\r
2837 #: ../source/TortoiseGit_en.xml:3800
\r
2839 msgid "In this dialog you have to enter the URL of the repository location where you want to import your project. It is very important to realise that the local folder you are importing does not itself appear in the repository, only its content. For example if you have a structure: <screen>\nC:\\Projects\\Widget\\source\nC:\\Projects\\Widget\\doc\nC:\\Projects\\Widget\\images\n</screen> and you import <filename>C:\\Projects\\Widget</filename> into <systemitem class=\"url\">http://mydomain.com/svn/trunk</systemitem> then you may be surprised to find that your subdirectories go straight into <literal>trunk</literal> rather than being in a <literal>Widget</literal> subdirectory. You need to specify the subdirectory as part of the URL, <systemitem class=\"url\">http://mydomain.com/svn/trunk/Widget-X</systemitem>. Note that the import command will automatically create subdirectories within the repository if they do not exist."
\r
2842 #: ../source/TortoiseGit_en.xml:3821
\r
2844 msgid "The import message is used as a log message."
\r
2847 #: ../source/TortoiseGit_en.xml:3824
\r
2849 msgid "By default, files and folders which match the global-ignore patterns are <emphasis>not</emphasis> imported. To override this behaviour you can use the <guilabel>Include ignored files</guilabel> checkbox. Refer to <xref linkend=\"tsvn-dug-settings-main\"/> for more information on setting a global ignore pattern."
\r
2852 #: ../source/TortoiseGit_en.xml:3831
\r
2854 msgid "As soon as you press <guibutton>OK</guibutton> TortoiseGit imports the complete directory tree including all files into the repository. The project is now stored in the repository under version control. Please note that the folder you imported is <emphasis>NOT</emphasis> under version control! To get a version-controlled <firstterm>working copy</firstterm> you need to do a Checkout of the version you just imported. Or read on to find out how to import a folder in place."
\r
2857 #: ../source/TortoiseGit_en.xml:3843
\r
2859 msgid "Import in Place"
\r
2862 #: ../source/TortoiseGit_en.xml:3845
\r
2864 msgid "import in place"
\r
2867 #: ../source/TortoiseGit_en.xml:3852
\r
2869 msgid "Use the repository browser to create a new project folder directly in the repository."
\r
2872 #: ../source/TortoiseGit_en.xml:3858
\r
2874 msgid "Checkout the new folder over the top of the folder you want to import. You will get a warning that the local folder is not empty. Now you have a versioned top level folder with unversioned content."
\r
2877 #: ../source/TortoiseGit_en.xml:3865
\r
2879 msgid "Use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Add...</guimenuitem></menuchoice> on this versioned folder to add some or all of the content. You can add and remove files, set <literal>svn:ignore</literal> properties on folders and make any other changes you need to."
\r
2882 #: ../source/TortoiseGit_en.xml:3877
\r
2884 msgid "Commit the top level folder, and you have a new versioned tree, and a local working copy, created from your existing folder."
\r
2887 #: ../source/TortoiseGit_en.xml:3847
\r
2889 msgid "Assuming you already have a repository, and you want to add a new folder structure to it, just follow these steps: <placeholder-1/>"
\r
2892 #: ../source/TortoiseGit_en.xml:3886
\r
2894 msgid "Special Files"
\r
2897 #: ../source/TortoiseGit_en.xml:3888
\r
2899 msgid "special files"
\r
2902 #: ../source/TortoiseGit_en.xml:3890
\r
2904 msgid "Sometimes you need to have a file under version control which contains user specific data. That means you have a file which every developer/user needs to modify to suit his/her local setup. But versioning such a file is difficult because every user would commit his/her changes every time to the repository."
\r
2907 #: ../source/TortoiseGit_en.xml:3897
\r
2909 msgid "In such cases we suggest to use <emphasis>template</emphasis> files. You create a file which contains all the data your developers will need, add that file to version control and let the developers check this file out. Then, each developer has to <emphasis>make a copy</emphasis> of that file and rename that copy. After that, modifying the copy is not a problem anymore."
\r
2912 #: ../source/TortoiseGit_en.xml:3905
\r
2914 msgid "As an example, you can have a look at TortoiseGit's build script. It calls a file named <filename>TortoiseVars.bat</filename> which doesn't exist in the repository. Only the file <filename>TortoiseVars.tmpl</filename>. <filename>TortoiseVars.tmpl</filename> is the template file which every developer has to create a copy from and rename that file to <filename>TortoiseVars.bat</filename>. Inside that file, we added comments so that the users will see which lines they have to edit and change according to their local setup to get it working."
\r
2917 #: ../source/TortoiseGit_en.xml:3916
\r
2919 msgid "So as not to disturb the users, we also added the file <filename>TortoiseVars.bat</filename> to the ignore list of its parent folder, i.e. we've set the Git property <literal>svn:ignore</literal> to include that filename. That way it won't show up as unversioned on every commit."
\r
2922 #: ../source/TortoiseGit_en.xml:3925
\r
2924 msgid "Referenced Projects"
\r
2927 #: ../source/TortoiseGit_en.xml:3927
\r
2929 msgid "external repositories"
\r
2932 #: ../source/TortoiseGit_en.xml:3930
\r
2934 #: ../source/TortoiseGit_en.xml:14014
\r
2939 #: ../source/TortoiseGit_en.xml:3932
\r
2941 msgid "Sometimes it is useful to construct a working copy that is made out of a number of different checkouts. For example, you may want different subdirectories to come from different locations in a repository, or perhaps from different repositories altogether. If you want every user to have the same layout, you can define the <literal>svn:externals</literal> properties."
\r
2944 #: ../source/TortoiseGit_en.xml:3940
\r
2946 msgid "Let's say you check out a working copy of <filename>/project1</filename> to <filename>D:\\dev\\project1</filename>. Select the folder <filename>D:\\dev\\project1</filename>, <action>right click</action> and choose <menuchoice><guimenu>Windows Menu</guimenu><guimenuitem>Properties</guimenuitem></menuchoice> from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click <guibutton>Add...</guibutton>. Select the <literal>svn:externals</literal> property from the combobox and write in the edit box the repository URL in the format <literal>name url</literal> or if you want to specify a particular revision, <literal>name -rREV url</literal> You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with <literal>%20</literal>. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on <filename>D:\\dev\\project1</filename>: <screen>\nsounds http://sounds.red-bean.com/repos\nquick_graphs http://graphics.red-bean.com/repos/fast%20graphics\nskins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n</screen> Now click <guibutton>Set</guibutton> and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder <filename>D:\\dev\\project1\\sounds</filename> and checkout the sounds project, another sub-folder <filename>D:\\dev\\project1\\quick graphs</filename> containing the graphics project, and finally a nested sub-folder <filename>D:\\dev\\project1\\skins\\toolkit</filename> containing revision 21 of the skin-maker project."
\r
2949 #: ../source/TortoiseGit_en.xml:3980
\r
2951 msgid "You should strongly consider using explicit revision numbers in all of your externals definitions, as described above. Doing so means that you get to decide when to pull down a different snapshot of external information, and exactly which snapshot to pull. Besides the common sense aspect of not being surprised by changes to third-party repositories that you might not have any control over, using explicit revision numbers also means that as you backdate your working copy to a previous revision, your externals definitions will also revert to the way they looked in that previous revision, which in turn means that the external working copies will be updated to match they way <emphasis>they</emphasis> looked back when your repository was at that previous revision. For software projects, this could be the difference between a successful and a failed build of an older snapshot of your complex code base."
\r
2954 #: ../source/TortoiseGit_en.xml:3999
\r
2956 #: ../source/TortoiseGit_en.xml:14046
\r
2958 msgid "If the external project is in the same repository, any changes you make there there will be included in the commit list when you commit your main project."
\r
2961 #: ../source/TortoiseGit_en.xml:4004
\r
2963 #: ../source/TortoiseGit_en.xml:14051
\r
2965 msgid "If the external project is in a different repository, any changes you make to the external project will be notified when you commit the main project, but you have to commit those external changes separately."
\r
2968 #: ../source/TortoiseGit_en.xml:4010
\r
2970 msgid "If you use absolute URLs in <literal>svn:externals</literal> definitions and you have to relocate your working copy (i.e., if the URL of your repository changes), then your externals won't change and might not work anymore."
\r
2973 #: ../source/TortoiseGit_en.xml:4016
\r
2975 msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at <systemitem class=\"url\">http://example.com/svn/repos-1</systemitem> and another at <systemitem class=\"url\">http://example.com/svn/repos-2</systemitem>. We have a checkout of <systemitem class=\"url\">http://example.com/svn/repos-1/project/trunk</systemitem> into <filename>C:\\Working</filename> and the <literal>svn:externals</literal> property is set on trunk."
\r
2978 #: ../source/TortoiseGit_en.xml:4031
\r
2980 msgid "Relative to parent directory"
\r
2983 #: ../source/TortoiseGit_en.xml:4033
\r
2985 msgid "These URLs always begin with the string <literal>../</literal> for example: <screen>\n../../widgets/foo common/foo-widget\n</screen> This will extract <systemitem class=\"url\">http://example.com/svn/repos-1/widgets/foo</systemitem> into <filename>C:\\Working\\common\\foo-widget</filename>."
\r
2988 #: ../source/TortoiseGit_en.xml:4044
\r
2990 msgid "Note that the URL is relative to the URL of the directory with the <literal>svn:externals</literal> property, not to the directory where the external is written to disk."
\r
2993 #: ../source/TortoiseGit_en.xml:4052
\r
2995 msgid "Relative to repository root"
\r
2998 #: ../source/TortoiseGit_en.xml:4054
\r
3000 msgid "These URLs always begin with the string <literal>^/</literal> for example: <screen>\n^/widgets/foo common/foo-widget\n</screen> This will extract <systemitem class=\"url\">http://example.com/svn/repos-1/widgets/foo</systemitem> into <filename>C:\\Working\\common\\foo-widget</filename>."
\r
3003 #: ../source/TortoiseGit_en.xml:4065
\r
3005 msgid "You can easily refer to other repositories with the same <literal>SVNParentPath</literal> (a common directory holding several repositories). For example: <screen>\n^/../repos-2/hammers/claw common/claw-hammer\n</screen> This will extract <systemitem class=\"url\">http://example.com/svn/repos-2/hammers/claw</systemitem> into <filename>C:\\Working\\common\\claw-hammer</filename>."
\r
3008 #: ../source/TortoiseGit_en.xml:4080
\r
3010 msgid "Relative to scheme"
\r
3013 #: ../source/TortoiseGit_en.xml:4082
\r
3015 msgid "URLs beginning with the string <literal>//</literal> copy only the scheme part of the URL. This is useful when the same hostname must the accessed with different schemes depending upon network location; e.g. clients in the intranet use <systemitem class=\"url\">http://</systemitem> while external clients use <systemitem class=\"url\">svn+ssh://</systemitem>. For example: <screen>\n//example.com/svn/repos-1/widgets/foo common/foo-widget\n</screen> This will extract <systemitem class=\"url\">http://example.com/svn/repos-1/widgets/foo</systemitem> or <systemitem class=\"url\">svn+ssh://example.com/svn/repos-1/widgets/foo</systemitem> depending on which method was used to checkout <filename>C:\\Working</filename>."
\r
3018 #: ../source/TortoiseGit_en.xml:4102
\r
3020 msgid "Relative to the server's hostname"
\r
3023 #: ../source/TortoiseGit_en.xml:4104
\r
3025 msgid "URLs beginning with the string <literal>/</literal> copy the scheme and the hostname part of the URL, for example: <screen>\n/svn/repos-1/widgets/foo common/foo-widget\n</screen> This will extract <systemitem class=\"url\">http://example.com/svn/repos-1/widgets/foo</systemitem> into <filename>C:\\Working\\common\\foo-widget</filename>. But if you checkout your working copy from another server at <systemitem class=\"url\">svn+ssh://another.mirror.net/svn/repos-1/project1/trunk</systemitem> then the external reference will extract <systemitem class=\"url\">svn+ssh://another.mirror.net/svn/repos-1/widgets/foo</systemitem>."
\r
3028 #: ../source/TortoiseGit_en.xml:4122
\r
3030 msgid "If you need more information how TortoiseGit handles Properties read <xref linkend=\"tsvn-dug-propertypage\"/>."
\r
3033 #: ../source/TortoiseGit_en.xml:4126
\r
3035 msgid "To find out about different methods of accessing common sub-projects read <xref linkend=\"tsvn-howto-common-projects\"/>."
\r
3038 #: ../source/TortoiseGit_en.xml:4133
\r
3040 msgid "Checking Out A Working Copy"
\r
3043 #: ../source/TortoiseGit_en.xml:4135
\r
3048 #: ../source/TortoiseGit_en.xml:4138
\r
3050 msgid "create working copy"
\r
3053 #: ../source/TortoiseGit_en.xml:4141
\r
3055 msgid "To obtain a working copy you need to do a <firstterm>checkout</firstterm> from a repository."
\r
3058 #: ../source/TortoiseGit_en.xml:4155
\r
3060 msgid "The Checkout dialog"
\r
3063 #: ../source/TortoiseGit_en.xml:4145
\r
3065 msgid "Select a directory in windows explorer where you want to place your working copy. <action>Right click</action> to pop up the context menu and select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Checkout...</guimenuitem></menuchoice>, which brings up the following dialog box: <placeholder-1/> If you enter a folder name that does not yet exist, then a directory with that name is created."
\r
3068 #: ../source/TortoiseGit_en.xml:4162
\r
3070 msgid "Checkout Depth"
\r
3073 #: ../source/TortoiseGit_en.xml:4170
\r
3075 msgid "Fully recursive"
\r
3078 #: ../source/TortoiseGit_en.xml:4172
\r
3080 msgid "Checkout the entire tree, including all child folders and sub-folders."
\r
3083 #: ../source/TortoiseGit_en.xml:4179
\r
3085 msgid "Immediate children, including folders"
\r
3088 #: ../source/TortoiseGit_en.xml:4181
\r
3090 msgid "Checkout the specified directory, including all files and child folders, but do not populate the child folders."
\r
3093 #: ../source/TortoiseGit_en.xml:4188
\r
3095 msgid "Only file children"
\r
3098 #: ../source/TortoiseGit_en.xml:4190
\r
3100 msgid "Checkout the specified directory, including all files but do not checkout any child folders."
\r
3103 #: ../source/TortoiseGit_en.xml:4197
\r
3105 msgid "Only this item"
\r
3108 #: ../source/TortoiseGit_en.xml:4199
\r
3110 msgid "Checkout the directory only. Do not populate it with files or child folders."
\r
3113 #: ../source/TortoiseGit_en.xml:4206
\r
3115 #: ../source/TortoiseGit_en.xml:8157
\r
3117 #: ../source/TortoiseGit_en.xml:15513
\r
3119 msgid "Working copy"
\r
3122 #: ../source/TortoiseGit_en.xml:4208
\r
3124 msgid "Retain the depth specified in the working copy. This option is not used in the checkout dialog, but it is the default in all other dialogs which have a depth setting."
\r
3127 #: ../source/TortoiseGit_en.xml:4163
\r
3129 msgid "You can choose the <firstterm>depth</firstterm> you want to checkout, which allows you to specify the depth of recursion into child folders. If you want just a few sections of a large tree, You can checkout the top level folder only, then update selected folders recursively. <placeholder-1/>"
\r
3132 #: ../source/TortoiseGit_en.xml:4218
\r
3134 msgid "If you check out a sparse working copy (i.e., by choosing something other than <literal>fully recursive</literal> for the checkout depth), you can fetch additional sub-folders by using the repository browser (<xref linkend=\"tsvn-dug-repobrowser\"/>) or the check for modifications dialog (<xref linkend=\"tsvn-dug-wcstatus-2\"/>)."
\r
3137 #: ../source/TortoiseGit_en.xml:4225
\r
3139 msgid "In the repository browser, <action>Right click</action> on the checked out folder, then use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Repo-Browser</guimenuitem></menuchoice> to bring up the repository browser. Find the sub-folder you would like to add to your working copy, then use <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Update item to revision...</guimenuitem></menuchoice> That menu will only be visible if the selected item does not exist yet in your working copy, but the parent item does exist."
\r
3142 #: ../source/TortoiseGit_en.xml:4241
\r
3144 msgid "In the check for modifications dialog, first click on the button <guibutton>Check repository</guibutton>. The dialog will show all the files and folders which are in the repository but which you have not checked out as <literal>remotely added</literal>. <action>Right click</action> on the folder(s) you would like to add to your working copy, then use <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Update</guimenuitem></menuchoice>."
\r
3147 #: ../source/TortoiseGit_en.xml:4253
\r
3149 msgid "This feature is very useful when you only want to checkout parts of a large tree, but you want the convenience of updating a single working copy. Suppose you have a large tree which has sub-folders <literal>Project01</literal> to <literal>Project99</literal>, and you only want to checkout <literal>Project03</literal>, <literal>Project25</literal> and <literal>Project76/SubProj</literal>. Use these steps:"
\r
3152 #: ../source/TortoiseGit_en.xml:4266
\r
3154 msgid "Checkout the parent folder with depth <quote>Only this item</quote> You now have an empty top level folder."
\r
3157 #: ../source/TortoiseGit_en.xml:4273
\r
3159 msgid "Select the new folder and use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Repo browser</guimenuitem></menuchoice> to display the repository content."
\r
3162 #: ../source/TortoiseGit_en.xml:4283
\r
3164 msgid "Right click on <literal>Project03</literal> and <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Update item to revision...</guimenuitem></menuchoice>. Keep the default settings and click on <guibutton>OK</guibutton>. You now have that folder fully populated."
\r
3167 #: ../source/TortoiseGit_en.xml:4293
\r
3169 msgid "Repeat the same process for <literal>Project25</literal>."
\r
3172 #: ../source/TortoiseGit_en.xml:4298
\r
3174 msgid "Navigate to <literal>Project76/SubProj</literal> and do the same. This time note that the <literal>Project76</literal> folder has no content except for <literal>SubProj</literal>, which itself is fully populated. Git has created the intermediate folders for you without populating them."
\r
3177 #: ../source/TortoiseGit_en.xml:4308
\r
3179 msgid "Working copy depth cannot be reduced"
\r
3182 #: ../source/TortoiseGit_en.xml:4309
\r
3184 msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git."
\r
3187 #: ../source/TortoiseGit_en.xml:4317
\r
3189 msgid "Using an older server"
\r
3192 #: ../source/TortoiseGit_en.xml:4318
\r
3194 msgid "Pre-1.5 servers do not understand the working copy depth request, so they cannot always deal with requests efficiently. The command will still work, but an older server may send all the data, leaving the client to filter out what is not required, which may mean a lot of network traffic. If possible you should upgrade your server to 1.5."
\r
3197 #: ../source/TortoiseGit_en.xml:4328
\r
3199 msgid "If the project contains references to external projects which you do <emphasis>not</emphasis> want checked out at the same time, use the <guilabel>Omit externals</guilabel> checkbox."
\r
3202 #: ../source/TortoiseGit_en.xml:4334
\r
3204 msgid "If <guilabel>Omit externals</guilabel> is checked, or if you wish to increase the depth value, you will have to perform updates to your working copy using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update to Revision...</guimenuitem></menuchoice> instead of <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update</guimenuitem></menuchoice>. The standard update will include all externals and keep the existing depth."
\r
3207 #: ../source/TortoiseGit_en.xml:4350
\r
3209 msgid "It is recommended that you check out only the <literal>trunk</literal> part of the directory tree, or lower. If you specify the parent path of the directory tree in the URL then you might end up with a full hard disk since you will get a copy of the entire repository tree including every branch and tag of your project!"
\r
3212 #: ../source/TortoiseGit_en.xml:4358
\r
3217 #: ../source/TortoiseGit_en.xml:4359
\r
3219 msgid "Sometimes you may want to create a local copy without any of those <filename>.svn</filename> directories, e.g. to create a zipped tarball of your source. Read <xref linkend=\"tsvn-dug-export\"/> to find out how to do that."
\r
3222 #: ../source/TortoiseGit_en.xml:4368
\r
3224 msgid "Committing Your Changes To The Repository"
\r
3227 #: ../source/TortoiseGit_en.xml:4370
\r
3232 #: ../source/TortoiseGit_en.xml:4373
\r
3234 msgid "send changes"
\r
3237 #: ../source/TortoiseGit_en.xml:4376
\r
3242 #: ../source/TortoiseGit_en.xml:4379
\r
3244 msgid "Sending the changes you made to your working copy is known as <firstterm>committing</firstterm> the changes. But before you commit you have to make sure that your working copy is up to date. You can either use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update</guimenuitem></menuchoice> directly. Or you can use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Check for Modifications</guimenuitem></menuchoice> first, to see which files have changed locally or on the server."
\r
3247 #: ../source/TortoiseGit_en.xml:4396
\r
3249 msgid "The Commit Dialog"
\r
3252 #: ../source/TortoiseGit_en.xml:4406
\r
3254 msgid "The Commit dialog"
\r
3257 #: ../source/TortoiseGit_en.xml:4397
\r
3259 msgid "If your working copy is up to date and there are no conflicts, you are ready to commit your changes. Select any file and/or folders you want to commit, then <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Commit...</guimenuitem></menuchoice>. <placeholder-1/>"
\r
3262 #: ../source/TortoiseGit_en.xml:4410
\r
3264 msgid "The commit dialog will show you every changed file, including added, deleted and unversioned files. If you don't want a changed file to be committed, just uncheck that file. If you want to include an unversioned file, just check that file to add it to the commit."
\r
3267 #: ../source/TortoiseGit_en.xml:4417
\r
3269 #: ../source/TortoiseGit_en.xml:5274
\r
3271 msgid "Items which have been switched to a different repository path are also indicated using an <literal>(s)</literal> marker. You may have switched something while working on a branch and forgotten to switch back to trunk. This is your warning sign!"
\r
3274 #: ../source/TortoiseGit_en.xml:4424
\r
3276 msgid "Commit files or folders?"
\r
3279 #: ../source/TortoiseGit_en.xml:4425
\r
3281 msgid "When you commit files, the commit dialog shows only the files you have selected. When you commit a folder the commit dialog will select the changed files automatically. If you forget about a new file you created, committing the folder will find it anyway. Committing a folder does <emphasis>not</emphasis> mean that every file gets marked as changed; It just makes your life easier by doing more work for you."
\r
3284 #: ../source/TortoiseGit_en.xml:4435
\r
3286 msgid "If you have modified files which have been included from a different repository using <literal>svn:externals</literal>, those changes cannot be included in the same atomic commit. A warning symbol below the file list tells you if this has happened, and the tooltip explains that those external files have to be committed separately."
\r
3289 #: ../source/TortoiseGit_en.xml:4443
\r
3291 msgid "Many unversioned files in the commit dialog"
\r
3294 #: ../source/TortoiseGit_en.xml:4450
\r
3296 msgid "add the file (or a wildcard extension) to the list of files to exclude on the settings page. This will affect every working copy you have."
\r
3299 #: ../source/TortoiseGit_en.xml:4457
\r
3301 msgid "add the file to the <literal>svn:ignore</literal> list using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Add to ignore list</guimenuitem></menuchoice> This will only affect the directory on which you set the <literal>svn:ignore</literal> property. Using the SVN Property Dialog, you can alter the <literal>svn:ignore</literal> property for a directory."
\r
3304 #: ../source/TortoiseGit_en.xml:4444
\r
3306 msgid "If you think that the commit dialog shows you too many unversioned (e.g. compiler generated or editor backup) files, there are several ways to handle this. You can: <placeholder-1/> Read <xref linkend=\"tsvn-dug-ignore\"/> for more information."
\r
3309 #: ../source/TortoiseGit_en.xml:4474
\r
3311 msgid "<action>Double clicking</action> on any modified file in the commit dialog will launch the external diff tool to show your changes. The context menu will give you more options, as shown in the screenshot. You can also drag files from here into another application such as a text editor or an IDE."
\r
3314 #: ../source/TortoiseGit_en.xml:4481
\r
3316 msgid "You can select or deselect items by clicking on the checkbox to the left of the item. For directories you can use <keycap>Shift</keycap>-<action>select</action> to make the action recursive."
\r
3319 #: ../source/TortoiseGit_en.xml:4486
\r
3321 msgid "The columns displayed in the bottom pane are customizable. If you <action>right click</action> on any column header you will see a context menu allowing you to select which columns are displayed. You can also change column width by using the drag handle which appears when you move the mouse over a column boundary. These customizations are preserved, so you will see the same headings next time."
\r
3324 #: ../source/TortoiseGit_en.xml:4495
\r
3326 msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the <guilabel>Keep locks</guilabel> checkbox is checked. The default state of this checkbox is taken from the <literal>no_unlock</literal> option in the Git configuration file. Read <xref linkend=\"tsvn-dug-settings-main\"/> for information on how to edit the Git configuration file."
\r
3329 #: ../source/TortoiseGit_en.xml:4506
\r
3331 msgid "You can drag files into the commit dialog from elsewhere, so long as the working copies are checked out from the same repository. For example, you may have a huge working copy with several explorer windows open to look at distant folders of the hierarchy. If you want to avoid committing from the top level folder (with a lengthy folder crawl to check for changes) you can open the commit dialog for one folder and drag in items from the other windows to include within the same atomic commit."
\r
3334 #: ../source/TortoiseGit_en.xml:4516
\r
3336 msgid "You can drag unversioned files which reside within a working copy into the commit dialog, and they will be SVN added automatically."
\r
3339 #: ../source/TortoiseGit_en.xml:4522
\r
3341 #: ../source/TortoiseGit_en.xml:5346
\r
3343 msgid "Repairing External Renames"
\r
3346 #: ../source/TortoiseGit_en.xml:4523
\r
3348 #: ../source/TortoiseGit_en.xml:5347
\r
3350 msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Repair Move</guimenuitem></menuchoice> to pair the two files as a rename."
\r
3353 #: ../source/TortoiseGit_en.xml:4538
\r
3355 #: ../source/TortoiseGit_en.xml:5392
\r
3357 msgid "Change Lists"
\r
3360 #: ../source/TortoiseGit_en.xml:4539
\r
3362 msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in <xref linkend=\"tsvn-dug-changelists\"/>."
\r
3365 #: ../source/TortoiseGit_en.xml:4546
\r
3367 msgid "Excluding Items from the Commit List"
\r
3370 #: ../source/TortoiseGit_en.xml:4547
\r
3372 msgid "Sometimes you have versioned files that change frequently but that you really don't want to commit. Sometimes this indicates a flaw in your build process - why are those files versioned? should you be using template files? But occasionally it is inevitable. A classic reason is that your IDE changes a timestamp in the project file every time you build. The project file has to be versioned as it includes all the build settings, but it doesn't need to be committed just because the timestamp changed."
\r
3375 #: ../source/TortoiseGit_en.xml:4557
\r
3377 msgid "To help out in awkward cases like this, we have reserved a changelist called <literal>ignore-on-commit</literal>. Any file added to this changelist will automatically be unchecked in the commit dialog. You can still commit changes, but you have to select it manually in the commit dialog."
\r
3380 #: ../source/TortoiseGit_en.xml:4566
\r
3382 msgid "Commit Log Messages"
\r
3385 #: ../source/TortoiseGit_en.xml:4567
\r
3387 msgid "Be sure to enter a log message which describes the changes you are committing. This will help you to see what happened and when, as you browse through the project log messages at a later date. The message can be as long or as brief as you like; many projects have guidelines for what should be included, the language to use, and sometimes even a strict format."
\r
3390 #: ../source/TortoiseGit_en.xml:4575
\r
3392 msgid "You can apply simple formatting to your log messages using a convention similar to that used within emails. To apply styling to <literal>text</literal>, use <literal>*text*</literal> for bold, <literal>_text_</literal> for underlining, and <literal>^text^</literal> for italics."
\r
3395 #: ../source/TortoiseGit_en.xml:4585
\r
3397 msgid "The Commit Dialog Spellchecker"
\r
3400 #: ../source/TortoiseGit_en.xml:4583
\r
3402 msgid "<placeholder-1/> TortoiseGit includes a spellchecker to help you get your log messages right. This will highlight any mis-spelled words. Use the context menu to access the suggested corrections. Of course, it doesn't know <emphasis>every</emphasis> technical term that you do, so correctly spelt words will sometimes show up as errors. But don't worry. You can just add them to your personal dictionary using the context menu."
\r
3405 #: ../source/TortoiseGit_en.xml:4595
\r
3407 msgid "The log message window also includes a filename and function auto-completion facility. This uses regular expressions to extract class and function names from the (text) files you are committing, as well as the filenames themselves. If a word you are typing matches anything in the list (after you have typed at least 3 characters, or pressed <keycap>Ctrl+Space</keycap>), a drop-down appears allowing you to select the full name. The regular expressions supplied with TortoiseGit are held in the TortoiseGit installation <filename>bin</filename> folder. You can also define your own regexes and store them in <filename>%APPDATA%\\TortoiseGit\\autolist.txt</filename>. Of course your private autolist will not be overwritten when you update your installation of TortoiseGit. If you are unfamiliar with regular expressions, take a look at the introduction at <ulink url=\"http://en.wikipedia.org/wiki/Regular_expression\"><citetitle>http://en.wikipedia.org/wiki/Regular_expression</citetitle></ulink>, and the online documentation and tutorial at <ulink url=\"http://www.regular-expressions.info/\"><citetitle>http://www.regular-expressions.info/</citetitle></ulink>."
\r
3410 #: ../source/TortoiseGit_en.xml:4616
\r
3412 msgid "You can re-use previously entered log messages. Just click on <guibutton>Recent messages</guibutton> to view a list of the last few messages you entered for this working copy. The number of stored messages can be customized in the TortoiseGit settings dialog."
\r
3415 #: ../source/TortoiseGit_en.xml:4622
\r
3417 msgid "You can clear all stored commit messages from the <guilabel>Saved data</guilabel> page of TortoiseGit's settings, or you can clear individual messages from within the <guilabel>Recent messages</guilabel> dialog using the <keycap>Delete</keycap> key."
\r
3420 #: ../source/TortoiseGit_en.xml:4628
\r
3422 msgid "If you want to include the checked paths in your log message, you can use the command <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Paste filename list</guimenuitem></menuchoice> in the edit control."
\r
3425 #: ../source/TortoiseGit_en.xml:4637
\r
3427 msgid "Another way to insert the paths into the log message is to simply drag the files from the file list onto the edit control."
\r
3430 #: ../source/TortoiseGit_en.xml:4642
\r
3432 msgid "Special Folder Properties"
\r
3435 #: ../source/TortoiseGit_en.xml:4643
\r
3437 msgid "There are several special folder properties which can be used to help give more control over the formatting of commit log messages and the language used by the spellchecker module. Read <xref linkend=\"tsvn-dug-propertypage\"/> for further information."
\r
3440 #: ../source/TortoiseGit_en.xml:4651
\r
3442 msgid "Integration with Bug Tracking Tools"
\r
3445 #: ../source/TortoiseGit_en.xml:4652
\r
3447 msgid "If you have activated the bug tracking system, you can set one or more Issues in the <guilabel>Bug-ID / Issue-Nr:</guilabel> text box. Multiple issues should be comma separated. Alternatively, if you are using regex-based bug tracking support, just add your issue references as part of the log message. Learn more in <xref linkend=\"tsvn-dug-bugtracker\"/>."
\r
3450 #: ../source/TortoiseGit_en.xml:4663
\r
3452 msgid "Commit Progress"
\r
3455 #: ../source/TortoiseGit_en.xml:4668
\r
3457 msgid "The Progress dialog showing a commit in progress"
\r
3460 #: ../source/TortoiseGit_en.xml:4664
\r
3462 msgid "After pressing <guibutton>OK</guibutton>, a dialog appears displaying the progress of the commit. <placeholder-1/>"
\r
3465 #: ../source/TortoiseGit_en.xml:4677
\r
3467 #: ../source/TortoiseGit_en.xml:5212
\r
3472 #: ../source/TortoiseGit_en.xml:4679
\r
3474 msgid "Committing a modification."
\r
3477 #: ../source/TortoiseGit_en.xml:4685
\r
3479 #: ../source/TortoiseGit_en.xml:4752
\r
3481 #: ../source/TortoiseGit_en.xml:5220
\r
3486 #: ../source/TortoiseGit_en.xml:4687
\r
3488 msgid "Committing a new addition."
\r
3491 #: ../source/TortoiseGit_en.xml:4693
\r
3493 #: ../source/TortoiseGit_en.xml:4760
\r
3495 #: ../source/TortoiseGit_en.xml:5232
\r
3500 #: ../source/TortoiseGit_en.xml:4695
\r
3502 msgid "Committing a deletion or a replacement."
\r
3505 #: ../source/TortoiseGit_en.xml:4701
\r
3507 #: ../source/TortoiseGit_en.xml:4787
\r
3509 #: ../source/TortoiseGit_en.xml:5260
\r
3514 #: ../source/TortoiseGit_en.xml:4703
\r
3516 msgid "All other items."
\r
3519 #: ../source/TortoiseGit_en.xml:4672
\r
3521 msgid "The progress dialog uses colour coding to highlight different commit actions <placeholder-1/>"
\r
3524 #: ../source/TortoiseGit_en.xml:4710
\r
3526 #: ../source/TortoiseGit_en.xml:4797
\r
3528 #: ../source/TortoiseGit_en.xml:5269
\r
3530 msgid "This is the default colour scheme, but you can customise those colours using the settings dialog. Read <xref linkend=\"tsvn-dug-settings-colours\"/> for more information."
\r
3533 #: ../source/TortoiseGit_en.xml:4718
\r
3535 msgid "Update Your Working Copy With Changes From Others"
\r
3538 #: ../source/TortoiseGit_en.xml:4720
\r
3540 #: ../source/TortoiseGit_en.xml:13767
\r
3545 #: ../source/TortoiseGit_en.xml:4723
\r
3547 msgid "fetch changes"
\r
3550 #: ../source/TortoiseGit_en.xml:4727
\r
3552 msgid "Progress dialog showing finished update"
\r
3555 #: ../source/TortoiseGit_en.xml:4725
\r
3557 msgid "<placeholder-1/> Periodically, you should ensure that changes done by others get incorporated in your local working copy. The process of getting changes from the server to your local copy is known as <emphasis>updating</emphasis>. Updating may be done on single files, a set of selected files, or recursively on entire directory hierarchies. To update, select the files and/or directories you want, <action>right click</action> and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update</guimenuitem></menuchoice> in the explorer context menu. A window will pop up displaying the progress of the update as it runs. Changes done by others will be merged into your files, keeping any changes you may have done to the same files. The repository is <emphasis>not</emphasis> affected by an update."
\r
3560 #: ../source/TortoiseGit_en.xml:4754
\r
3562 msgid "New item added to your WC."
\r
3565 #: ../source/TortoiseGit_en.xml:4762
\r
3567 msgid "Redundant item deleted from your WC, or missing item replaced in your WC."
\r
3570 #: ../source/TortoiseGit_en.xml:4769
\r
3572 #: ../source/TortoiseGit_en.xml:5240
\r
3577 #: ../source/TortoiseGit_en.xml:4771
\r
3579 msgid "Changes from repository successfully merged with your local changes."
\r
3582 #: ../source/TortoiseGit_en.xml:4778
\r
3584 #: ../source/TortoiseGit_en.xml:5250
\r
3586 msgid "Bright red"
\r
3589 #: ../source/TortoiseGit_en.xml:4780
\r
3591 msgid "Changes from repository merged with local changes, resulting in conflicts which you need to resolve."
\r
3594 #: ../source/TortoiseGit_en.xml:4789
\r
3596 msgid "Unchanged item in your WC updated with newer version from the repository."
\r
3599 #: ../source/TortoiseGit_en.xml:4747
\r
3601 msgid "The progress dialog uses colour coding to highlight different update actions <placeholder-1/>"
\r
3604 #: ../source/TortoiseGit_en.xml:4802
\r
3606 msgid "If you get any <emphasis>conflicts</emphasis> during an update (this can happen if others changed the same lines in the same file as you did and those changes don't match) then the dialog shows those conflicts in red. You can <action>double click</action> on these lines to start the external merge tool to resolve the conflicts."
\r
3609 #: ../source/TortoiseGit_en.xml:4809
\r
3611 msgid "When the update is complete, the progress dialog shows a summary of the number of items updated, added, removed, conflicted, etc. below the file list. This summary information can be copied to the clipboard using <keycap>Ctrl+C</keycap>."
\r
3614 #: ../source/TortoiseGit_en.xml:4816
\r
3616 msgid "The standard Update command has no options and just updates your working copy to the HEAD revision of the repository, which is the most common use case. If you want more control over the update process, you should use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update to Revision...</guimenuitem></menuchoice> instead. This allows you to update your working copy to a specific revision, not only to the most recent one. Suppose your working copy is at revision 100, but you want it to reflect the state which it had in revision 50 - then simply update to revision 50. In the same dialog you can also choose the <firstterm>depth</firstterm> at which to update the current folder. The terms used are described in <xref linkend=\"tsvn-dug-checkout-depth\"/>. The default depth is <guilabel>Working copy</guilabel>, which preserves the existing depth setting. You can also choose whether to ignore any external projects in the update (i.e. projects referenced using <literal>svn:externals</literal>)."
\r
3619 #: ../source/TortoiseGit_en.xml:4838
\r
3621 msgid "If you update a file or folder to a specific revision, you should not make changes to those files. You will get <quote>out of date</quote> error messages when you try to commit them! If you want to undo changes to a file and start afresh from an earlier revision, you can rollback to a previous revision from the revision log dialog. Take a look at <xref linkend=\"tsvn-howto-rollback\"/> for further instructions, and alternative methods."
\r
3624 #: ../source/TortoiseGit_en.xml:4848
\r
3626 msgid "<menuchoice><guimenuitem>Update to Revision</guimenuitem></menuchoice> can occasionally be useful to see what your project looked like at some earlier point in its history. But in general, updating individual files to an earlier revision is not a good idea as it leaves your working copy in an inconsistent state. If the file you are updating has changed name, you may even find that the file just disappears from your working copy because no file of that name existed in the earlier revision. You should also note that the item will show a normal green overlay, so it is indistinguishable from files which are up-to-date."
\r
3629 #: ../source/TortoiseGit_en.xml:4862
\r
3631 msgid "If you simply want a local copy of an old version of a file it is better to use the <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Save revision to...</guimenuitem></menuchoice> command from the log dialog for that file."
\r
3634 #: ../source/TortoiseGit_en.xml:4872
\r
3636 msgid "Multiple Files/Folders"
\r
3639 #: ../source/TortoiseGit_en.xml:4873
\r
3641 msgid "If you select multiple files and folders in the explorer and then select <menuchoice><guimenuitem>Update</guimenuitem></menuchoice>, all of those files/folders are updated one by one. TortoiseGit makes sure that all files/folders which are from the same repository are updated to the exact same revision! Even if between those updates another commit occurred."
\r
3644 #: ../source/TortoiseGit_en.xml:4885
\r
3646 msgid "Local File Already Exists"
\r
3649 #: ../source/TortoiseGit_en.xml:4886
\r
3651 msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file."
\r
3654 #: ../source/TortoiseGit_en.xml:4895
\r
3656 msgid "If you get this error message, the solution is simply to rename the local unversioned file. After completing the update, you can check whether the renamed file is still needed."
\r
3659 #: ../source/TortoiseGit_en.xml:4900
\r
3661 msgid "If you keep getting error messages, use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Check for Modifications</guimenuitem></menuchoice> instead to list all the problem files. That way you can deal with them all at once."
\r
3664 #: ../source/TortoiseGit_en.xml:4913
\r
3666 msgid "Resolving Conflicts"
\r
3669 #: ../source/TortoiseGit_en.xml:4918
\r
3674 #: ../source/TortoiseGit_en.xml:4941
\r
3676 msgid "filename.ext.mine"
\r
3679 #: ../source/TortoiseGit_en.xml:4943
\r
3681 msgid "This is your file as it existed in your working copy before you updated your working copy - that is, without conflict markers. This file has your latest changes in it and nothing else."
\r
3684 #: ../source/TortoiseGit_en.xml:4952
\r
3686 msgid "filename.ext.rOLDREV"
\r
3689 #: ../source/TortoiseGit_en.xml:4954
\r
3691 msgid "This is the file that was the BASE revision before you updated your working copy. That is, it the file that you checked out before you made your latest edits."
\r
3694 #: ../source/TortoiseGit_en.xml:4963
\r
3696 msgid "filename.ext.rNEWREV"
\r
3699 #: ../source/TortoiseGit_en.xml:4965
\r
3701 msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository."
\r
3704 #: ../source/TortoiseGit_en.xml:4920
\r
3706 msgid "Once in a while, you will get a <emphasis>conflict</emphasis> when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <literal><<<<<<<</literal>. The conflicting area is marked like this: <screen>\n<<<<<<< filename\n your changes\n=======\n code merged from repository\n>>>>>>> revision\n</screen> Also, for every conflicted file Git places three additional files in your directory: <placeholder-1/>"
\r
3709 #: ../source/TortoiseGit_en.xml:4975
\r
3711 msgid "You can either launch an external merge tool / conflict editor with <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Edit Conflicts</guimenuitem></menuchoice> or you can use any other editor to manually resolve the conflict. You should decide what the code should look like, do the necessary changes and save the file."
\r
3714 #: ../source/TortoiseGit_en.xml:4986
\r
3716 msgid "Afterwards execute the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Resolved</guimenuitem></menuchoice> and commit your modifications to the repository. Please note that the Resolve command does not really resolve the conflict. It just removes the <filename>filename.ext.mine</filename> and <filename>filename.ext.r*</filename> files, to allow you to commit your changes."
\r
3719 #: ../source/TortoiseGit_en.xml:4999
\r
3721 msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have <filename>filename.ext.r*</filename> files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version."
\r
3724 #: ../source/TortoiseGit_en.xml:5009
\r
3726 msgid "You can use the Resolved command for multiple files if you right click on the parent folder and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Resolved...</guimenuitem></menuchoice> This will bring up a dialog listing all conflicted files in that folder, and you can select which ones to mark as resolved."
\r
3729 #: ../source/TortoiseGit_en.xml:5022
\r
3731 msgid "Getting Status Information"
\r
3734 #: ../source/TortoiseGit_en.xml:5024
\r
3736 #: ../source/TortoiseGit_en.xml:5173
\r
3741 #: ../source/TortoiseGit_en.xml:5027
\r
3743 msgid "view changes"
\r
3746 #: ../source/TortoiseGit_en.xml:5030
\r
3748 msgid "working copy status"
\r
3751 #: ../source/TortoiseGit_en.xml:5032
\r
3753 msgid "While you are working on your working copy you often need to know which files you have changed/added/removed or renamed, or even which files got changed and committed by others."
\r
3756 #: ../source/TortoiseGit_en.xml:5040
\r
3758 #: ../source/TortoiseGit_en.xml:15668
\r
3763 #: ../source/TortoiseGit_en.xml:5043
\r
3768 #: ../source/TortoiseGit_en.xml:5051
\r
3770 msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different."
\r
3773 #: ../source/TortoiseGit_en.xml:5059
\r
3775 msgid "<graphic fileref=\"../images/InGitIcon.png\"/> A fresh checked out working copy has a green checkmark as overlay. That means the Git status is <emphasis>normal</emphasis>."
\r
3778 #: ../source/TortoiseGit_en.xml:5064
\r
3780 msgid "<graphic fileref=\"../images/ModifiedIcon.png\"/> As soon as you start editing a file, the status changes to <emphasis>modified</emphasis> and the icon overlay then changes to a red exclamation mark. That way you can easily see which files were changed since you last updated your working copy and need to be committed."
\r
3783 #: ../source/TortoiseGit_en.xml:5072
\r
3785 msgid "<graphic fileref=\"../images/ConflictIcon.png\"/> If during an update a <emphasis>conflict</emphasis> occurs then the icon changes to a yellow exclamation mark."
\r
3788 #: ../source/TortoiseGit_en.xml:5077
\r
3790 msgid "<graphic fileref=\"../images/ReadOnlyIcon.png\"/> If you have set the <literal>svn:needs-lock</literal> property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file."
\r
3793 #: ../source/TortoiseGit_en.xml:5084
\r
3795 msgid "<graphic fileref=\"../images/LockedIcon.png\"/> If you hold a lock on a file, and the Git status is <emphasis>normal</emphasis>, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file."
\r
3798 #: ../source/TortoiseGit_en.xml:5091
\r
3800 msgid "<graphic fileref=\"../images/DeletedIcon.png\"/> This icon shows you that some files or folders inside the current folder have been scheduled to be <emphasis>deleted</emphasis> from version control or a file under version control is missing in a folder."
\r
3803 #: ../source/TortoiseGit_en.xml:5097
\r
3805 msgid "<graphic fileref=\"../images/AddedIcon.png\"/> The plus sign tells you that a file or folder has been scheduled to be <emphasis>added</emphasis> to version control."
\r
3808 #: ../source/TortoiseGit_en.xml:5102
\r
3810 msgid "<graphic fileref=\"../images/IgnoredIcon.png\"/> The bar sign tells you that a file or folder is <emphasis>ignored</emphasis> for version control purposes. This overlay is optional."
\r
3813 #: ../source/TortoiseGit_en.xml:5108
\r
3815 msgid "<graphic fileref=\"../images/UnversionedIcon.png\"/> This icon shows files and folders which are not under version control, but have not been ignored. This overlay is optional."
\r
3818 #: ../source/TortoiseGit_en.xml:5114
\r
3820 msgid "In fact, you may find that not all of these icons are used on your system. This is because the number of overlays allowed by Windows is very limited and if you are also using an old version of TortoiseCVS, then there are not enough overlay slots available. TortoiseGit tries to be a <quote>Good Citizen (TM)</quote> and limits its use of overlays to give other apps a chance too."
\r
3823 #: ../source/TortoiseGit_en.xml:5122
\r
3825 msgid "Now that there are more Tortoise clients around (TortoiseCVS, TortoiseHG, ...) the icon limit becomes a real problem. To work around this, the TortoiseGit project introduced a common shared icon set, loaded as a DLL, which can be used by all Tortoise clients. Check with your client provider to see if this has been integrated yet :-)"
\r
3828 #: ../source/TortoiseGit_en.xml:5129
\r
3830 msgid "For a description of how icon overlays correspond to Git status and other technical details, read <xref linkend=\"tsvn-app-internals-overlays\"/>."
\r
3833 #: ../source/TortoiseGit_en.xml:5136
\r
3835 msgid "TortoiseGit Columns In Windows Explorer"
\r
3838 #: ../source/TortoiseGit_en.xml:5138
\r
3840 msgid "Explorer Columns"
\r
3843 #: ../source/TortoiseGit_en.xml:5140
\r
3845 msgid "The same information which is available from the icon overlays (and much more) can be displayed as additional columns in Windows Explorer's Details View."
\r
3848 #: ../source/TortoiseGit_en.xml:5145
\r
3850 msgid "Simply right click on one of the headings of a column, choose <guimenuitem>More...</guimenuitem> from the context menu displayed. A dialog will appear where you can specify the columns and their order, which is displayed in the <quote>Detailed View</quote>. Scroll down until the entries starting with SVN come into view. Check the ones you would like to have displayed and close the dialog by pressing <guibutton>OK</guibutton>. The columns will be appended to the right of those currently displayed. You can reorder them by drag and drop, or resize them, so that they fit your needs."
\r
3853 #: ../source/TortoiseGit_en.xml:5157
\r
3855 msgid "The additional columns in the Windows Explorer are not available on Vista, since Microsoft decided to not allow such columns for <emphasis>all</emphasis> files anymore but only for specific file types."
\r
3858 #: ../source/TortoiseGit_en.xml:5163
\r
3860 msgid "If you want the current layout to be displayed in all your working copies, you may want to make this the default view."
\r
3863 #: ../source/TortoiseGit_en.xml:5171
\r
3865 msgid "Local and Remote Status"
\r
3868 #: ../source/TortoiseGit_en.xml:5176
\r
3870 msgid "modifications"
\r
3873 #: ../source/TortoiseGit_en.xml:5180
\r
3875 #: ../source/TortoiseGit_en.xml:15360
\r
3877 msgid "Check for Modifications"
\r
3880 #: ../source/TortoiseGit_en.xml:5178
\r
3882 msgid "<placeholder-1/> It's often very useful to know which files you have changed and also which files got changed and committed by others. That's where the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Check For Modifications...</guimenuitem></menuchoice> comes in handy. This dialog will show you every file that has changed in any way in your working copy, as well as any unversioned files you may have."
\r
3885 #: ../source/TortoiseGit_en.xml:5195
\r
3887 msgid "If you click on the <guibutton>Check Repository</guibutton> then you can also look for changes in the repository. That way you can check before an update if there's a possible conflict. You can also update selected files from the repository without updating the whole folder. By default, the <guibutton>Check Repository</guibutton> button only fetches the remote status with the checkout depth of the working copy. If you want to see all files and folders in the repository, even those you have not checked out, then you have to hold down the <keycap>Shift</keycap> key when you click on the <guibutton>Check Repository</guibutton> button."
\r
3890 #: ../source/TortoiseGit_en.xml:5214
\r
3892 msgid "Locally modified items."
\r
3895 #: ../source/TortoiseGit_en.xml:5222
\r
3897 msgid "Added items. Items which have been added with history have a <literal>+</literal> sign in the <guilabel>Text status</guilabel> column, and a tooltip shows where the item was copied from."
\r
3900 #: ../source/TortoiseGit_en.xml:5234
\r
3902 msgid "Deleted or missing items."
\r
3905 #: ../source/TortoiseGit_en.xml:5242
\r
3907 msgid "Items modified locally and in the repository. The changes will be merged on update. These <emphasis>may</emphasis> produce conflicts on update."
\r
3910 #: ../source/TortoiseGit_en.xml:5252
\r
3912 msgid "Items modified locally and deleted in repository, or modified in repository and deleted locally. These <emphasis>will</emphasis> produce conflicts on update."
\r
3915 #: ../source/TortoiseGit_en.xml:5262
\r
3917 msgid "Unchanged and unversioned items."
\r
3920 #: ../source/TortoiseGit_en.xml:5208
\r
3922 msgid "The dialog uses colour coding to highlight the status. <placeholder-1/>"
\r
3925 #: ../source/TortoiseGit_en.xml:5280
\r
3927 msgid "From the context menu of the dialog you can show a diff of the changes. Check the local changes <emphasis>you</emphasis> made using <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Compare with Base</guimenuitem></menuchoice>. Check the changes in the repository made by others using <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Show Differences as Unified Diff</guimenuitem></menuchoice>."
\r
3930 #: ../source/TortoiseGit_en.xml:5293
\r
3932 msgid "You can also revert changes in individual files. If you have deleted a file accidentally, it will show up as <emphasis>Missing</emphasis> and you can use <emphasis>Revert</emphasis> to recover it."
\r
3935 #: ../source/TortoiseGit_en.xml:5298
\r
3937 msgid "Unversioned and ignored files can be sent to the recycle bin from here using <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Delete</guimenuitem></menuchoice>. If you want to delete files permanently (bypassing the recycle bin) hold the <keycap>Shift</keycap> key while clicking on <guilabel>Delete</guilabel>."
\r
3940 #: ../source/TortoiseGit_en.xml:5307
\r
3942 msgid "If you want to examine a file in detail, you can drag it from here into another application such as a text editor or IDE."
\r
3945 #: ../source/TortoiseGit_en.xml:5311
\r
3947 msgid "The columns are customizable. If you <action>right click</action> on any column header you will see a context menu allowing you to select which columns are displayed. You can also change column width by using the drag handle which appears when you move the mouse over a column boundary. These customizations are preserved, so you will see the same headings next time."
\r
3950 #: ../source/TortoiseGit_en.xml:5320
\r
3952 msgid "If you are working on several unrelated tasks at once, you can also group files together into changelists. Read <xref linkend=\"tsvn-dug-commit-changelists\"/> for more information."
\r
3955 #: ../source/TortoiseGit_en.xml:5325
\r
3957 msgid "At the bottom of the dialog you can see a summary of the range of repository revisions in use in your working copy. These are the <emphasis>commit</emphasis> revisions, not the <emphasis>update</emphasis> revisions; they represent the range of revisions where these files were last committed, not the revisions to which they have been updated. Note that the revision range shown applies only to the items displayed, not to the entire working copy. If you want to see that information for the whole working copy you must check the <guilabel>Show unmodified files</guilabel> checkbox."
\r
3960 #: ../source/TortoiseGit_en.xml:5336
\r
3962 msgid "If you want a flat view of your working copy, i.e. showing all files and folders at every level of the folder hierarchy, then the <guilabel>Check for Modifications</guilabel> dialog is the easiest way to achieve that. Just check the <guilabel>Show unmodified files</guilabel> checkbox to show all files in your working copy."
\r
3965 #: ../source/TortoiseGit_en.xml:5362
\r
3967 msgid "Viewing Diffs"
\r
3970 #: ../source/TortoiseGit_en.xml:5364
\r
3975 #: ../source/TortoiseGit_en.xml:5366
\r
3977 msgid "Often you want to look inside your files, to have a look at what you've changed. You can accomplish this by selecting a file which has changed, and selecting <guimenuitem>Diff</guimenuitem> from TortoiseGit's context menu. This starts the external diff-viewer, which will then compare the current file with the pristine copy (<literal>BASE</literal> revision), which was stored after the last checkout or update."
\r
3980 #: ../source/TortoiseGit_en.xml:5376
\r
3982 msgid "Even when not inside a working copy or when you have multiple versions of the file lying around, you can still display diffs:"
\r
3985 #: ../source/TortoiseGit_en.xml:5380
\r
3987 msgid "Select the two files you want to compare in explorer (e.g. using <keycap>Ctrl</keycap> and the mouse) and choose <guimenuitem>Diff</guimenuitem> from TortoiseGit's context menu. The file clicked last (the one with the focus, i.e. the dotted rectangle) will be regarded as the later one."
\r
3990 #: ../source/TortoiseGit_en.xml:5394
\r
3992 msgid "changelist"
\r
3995 #: ../source/TortoiseGit_en.xml:5396
\r
3997 msgid "In an ideal world, you only ever work on one thing at a time, and your working copy contains only one set of logical changes. OK, back to reality. It often happens that you have to work on several unrelated tasks at once, and when you look in the commit dialog, all the changes are mixed in together. The <firstterm>changelist</firstterm> feature helps you group files together, making it easier to see what you are doing. Of course this can only work if the changes do not overlap. If two different tasks affect the same file, there is no way to separate the changes."
\r
4000 #: ../source/TortoiseGit_en.xml:5407
\r
4002 msgid "The changelist feature in TortoiseGit is only available in Windows XP and later, as it depends on a shell capability which is not present in Windows 2000. Sorry, but Win2K is really quite old now, so please don't complain."
\r
4005 #: ../source/TortoiseGit_en.xml:5414
\r
4007 msgid "You can see changelists in several places, but the most important ones are the commit dialog and the check-for-modifications dialog. Let's start in the check-for-modifications dialog after you have worked on several features and many files. When you first open the dialog, all the changed files are listed together. Suppose you now want to organise things and group those files according to feature."
\r
4010 #: ../source/TortoiseGit_en.xml:5422
\r
4012 msgid "Select one or more files and use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Move to changelist</guimenuitem></menuchoice> to add an item to a changelist. Initially there will be no changelists, so the first time you do this you will create a new changelist. Give it name which describes what you are using it for, and click <guibutton>OK</guibutton>. The dialog will now change to show groups of items."
\r
4015 #: ../source/TortoiseGit_en.xml:5434
\r
4017 msgid "Once you have created a changelist you can drag and drop items into it, either from another changelist, or from Windows Explorer. Dragging from Explorer can be useful as it allows you to add items to a changelist before the file is modified. You could do that from the check-for-modifications dialog, but only by displaying all unmodified files."
\r
4020 #: ../source/TortoiseGit_en.xml:5443
\r
4022 msgid "Commit dialog with Changelists"
\r
4025 #: ../source/TortoiseGit_en.xml:5441
\r
4027 msgid "<placeholder-1/> In the commit dialog you can see those same files, grouped by changelist. Apart from giving an immediate visual indication of groupings, you can also use the group headings to select which files to commit."
\r
4030 #: ../source/TortoiseGit_en.xml:5450
\r
4032 msgid "On XP, there is a context menu when you right click on a group heading which gives you the choice to check or uncheck all group entries. On Vista however the context menu is not necessary. Click on the group header to select all entries, then check one of the selected entries to check all."
\r
4035 #: ../source/TortoiseGit_en.xml:5456
\r
4037 msgid "TortoiseGit reserves one changelist name for its own use, namely <literal>ignore-on-commit</literal>. This is used to mark versioned files which you almost never want to commit even though they have local changes. This feature is described in <xref linkend=\"tsvn-dug-commit-ignore\"/>."
\r
4040 #: ../source/TortoiseGit_en.xml:5462
\r
4042 msgid "When you commit files belonging to a changelist then normally you would expect that the changelist membership is no longer needed. So by default, files are removed from changelists automatically on commit. If you wish to retain the file in its changelist, use the <guilabel>Keep changelists</guilabel> checkbox at the bottom of the commit dialog."
\r
4045 #: ../source/TortoiseGit_en.xml:5470
\r
4047 msgid "Changelists are purely a local client feature. Creating and removing changelists will not affect the repository, nor anyone else's working copy. They are simply a convenient way for you to organise your files."
\r
4050 #: ../source/TortoiseGit_en.xml:5478
\r
4052 msgid "Revision Log Dialog"
\r
4055 #: ../source/TortoiseGit_en.xml:5480
\r
4060 #: ../source/TortoiseGit_en.xml:5483
\r
4065 #: ../source/TortoiseGit_en.xml:5486
\r
4067 msgid "commit messages"
\r
4070 #: ../source/TortoiseGit_en.xml:5489
\r
4072 msgid "log messages"
\r
4075 #: ../source/TortoiseGit_en.xml:5492
\r
4077 msgid "For every change you make and commit, you should provide a log message for that change. That way you can later find out what changes you made and why, and you have a detailed log for your development process."
\r
4080 #: ../source/TortoiseGit_en.xml:5504
\r
4082 msgid "The top pane shows a list of revisions where changes to the file/folder have been committed. This summary includes the date and time, the person who committed the revision and the start of the log message."
\r
4085 #: ../source/TortoiseGit_en.xml:5510
\r
4087 msgid "Lines shown in blue indicate that something has been copied to this development line (perhaps from a branch)."
\r
4090 #: ../source/TortoiseGit_en.xml:5516
\r
4092 msgid "The middle pane shows the full log message for the selected revision."
\r
4095 #: ../source/TortoiseGit_en.xml:5522
\r
4097 msgid "The bottom pane shows a list of all files and folders that were changed as part of the selected revision."
\r
4100 #: ../source/TortoiseGit_en.xml:5498
\r
4102 msgid "The Revision Log Dialog retrieves all those log messages and shows them to you. The display is divided into 3 panes. <placeholder-1/> But it does much more than that - it provides context menu commands which you can use to get even more information about the project history."
\r
4105 #: ../source/TortoiseGit_en.xml:5533
\r
4107 msgid "Invoking the Revision Log Dialog"
\r
4110 #: ../source/TortoiseGit_en.xml:5536
\r
4112 msgid "The Revision Log Dialog"
\r
4115 #: ../source/TortoiseGit_en.xml:5542
\r
4117 msgid "From the TortoiseGit context submenu"
\r
4120 #: ../source/TortoiseGit_en.xml:5547
\r
4122 msgid "From the property page"
\r
4125 #: ../source/TortoiseGit_en.xml:5552
\r
4127 msgid "From the Progress dialog after an update has finished. Then the Log dialog only shows those revisions which were changed since your last update"
\r
4130 #: ../source/TortoiseGit_en.xml:5534
\r
4132 msgid "<placeholder-1/> There are several places from where you can show the Log dialog: <placeholder-2/>"
\r
4135 #: ../source/TortoiseGit_en.xml:5562
\r
4137 msgid "Revision Log Actions"
\r
4140 #: ../source/TortoiseGit_en.xml:5563
\r
4142 msgid "The top pane has an <guilabel>Actions</guilabel> column containing icons that summarize what has been done in that revision. There are four different icons, each shown in its own column."
\r
4145 #: ../source/TortoiseGit_en.xml:5568
\r
4147 msgid "<graphic fileref=\"../images/ActionModifiedIcon.png\"/> If a revision modified a file or directory, the <emphasis>modified</emphasis> icon is shown in the first column."
\r
4150 #: ../source/TortoiseGit_en.xml:5573
\r
4152 msgid "<graphic fileref=\"../images/ActionAddedIcon.png\"/> If a revision added a file or directory, the <emphasis>added</emphasis> icon is shown in the second column."
\r
4155 #: ../source/TortoiseGit_en.xml:5578
\r
4157 msgid "<graphic fileref=\"../images/ActionDeletedIcon.png\"/> If a revision deleted a file or directory, the <emphasis>deleted</emphasis> icon is shown in the third column."
\r
4160 #: ../source/TortoiseGit_en.xml:5583
\r
4162 msgid "<graphic fileref=\"../images/ActionReplacedIcon.png\"/> If a revision replaced a file or directory, the <emphasis>replaced</emphasis> icon is shown in the fourth column."
\r
4165 #: ../source/TortoiseGit_en.xml:5590
\r
4167 msgid "Getting Additional Information"
\r
4170 #: ../source/TortoiseGit_en.xml:5593
\r
4172 msgid "The Revision Log Dialog Top Pane with Context Menu"
\r
4175 #: ../source/TortoiseGit_en.xml:5602
\r
4177 msgid "Compare the selected revision with your working copy. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseGit. If the log dialog is for a folder, this will show you a list of changed files, and allow you to review the changes made to each file individually."
\r
4180 #: ../source/TortoiseGit_en.xml:5612
\r
4182 msgid "View the changes made in the selected revision as a Unified-Diff file (GNU patch format). This shows only the differences with a few lines of context. It is harder to read than a visual file compare, but will show all file changes together in a compact format."
\r
4185 #: ../source/TortoiseGit_en.xml:5621
\r
4187 msgid "Compare the selected revision with the previous revision. This works in a similar manner to comparing with your working copy."
\r
4190 #: ../source/TortoiseGit_en.xml:5628
\r
4192 msgid "Blame the selected revision, and the file in your working BASE and compare the blame reports using a visual diff tool. Read <xref linkend=\"tsvn-dug-blame-diffs\"/> for more detail. (files only)."
\r
4195 #: ../source/TortoiseGit_en.xml:5636
\r
4197 msgid "Blame the selected revision, and the previous revision, and compare the results using a visual diff tool. (folders only)."
\r
4200 #: ../source/TortoiseGit_en.xml:5643
\r
4202 msgid "Save the selected revision to a file so you have an older version of that file. (files only)."
\r
4205 #: ../source/TortoiseGit_en.xml:5649
\r
4207 msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose. (files only)."
\r
4210 #: ../source/TortoiseGit_en.xml:5655
\r
4212 msgid "Blame the file up to the selected revision. (files only)."
\r
4215 #: ../source/TortoiseGit_en.xml:5660
\r
4217 msgid "Open the repository browser to examine the selected file or folder in the repository as it was at the selected revision."
\r
4220 #: ../source/TortoiseGit_en.xml:5666
\r
4222 msgid "Create a branch/tag from a selected revision. This is useful e.g. if you forgot to create a tag and already committed some changes which weren't supposed to get into that release."
\r
4225 #: ../source/TortoiseGit_en.xml:5674
\r
4227 msgid "Update your working copy to the selected revision. Useful if you want to have your working copy reflect a time in the past. It is best to update a whole directory in your working copy, not just one file, otherwise your working copy will be inconsistent and you will be unable to commit any changes."
\r
4230 #: ../source/TortoiseGit_en.xml:5684
\r
4232 msgid "Revert changes from which were made in the selected revision. The changes are reverted in your working copy so this operation does <emphasis>not</emphasis> affect the repository at all! Note that this will undo the changes made in that revision only. It does not replace your working copy with the entire file at the earlier revision. This is very useful for undoing an earlier change when other unrelated changes have been made since. If you have made local changes, this command will merge these changes into your working copy."
\r
4235 #: ../source/TortoiseGit_en.xml:5698
\r
4237 msgid "Revert to an earlier revision. If you have made several changes, and then decide that you really want to go back to how things were in revision N, this is the command you need. Again, the changes are reverted in your working copy so this operation does <emphasis>not</emphasis> affect the repository until you commit the changes. Note that this will undo <emphasis>all</emphasis> changes made after the selected revision, replacing the file/folder with the earlier version. If you have made local changes, this command will merge these changes into your working copy."
\r
4240 #: ../source/TortoiseGit_en.xml:5712
\r
4242 msgid "Merge the selected revision(s) into a different working copy. A folder selection dialog allows you to choose the working copy to merge into, but after that there is no confirmation dialog, nor any opportunity to try a test merge. It is a good idea to merge into an unmodified working copy so that you can revert the changes if it doesn't work out! This is a useful feature if you want to merge selected revisions from one branch to another."
\r
4245 #: ../source/TortoiseGit_en.xml:5724
\r
4247 msgid "Make a fresh checkout of the selected folder at the selected revision. This brings up a dialog for you to confirm the URL and revision, and select a location for the checkout."
\r
4250 #: ../source/TortoiseGit_en.xml:5731
\r
4252 msgid "Export the selected file/folder at the selected revision. This brings up a dialog for you to confirm the URL and revision, and select a location for the export."
\r
4255 #: ../source/TortoiseGit_en.xml:5738
\r
4257 msgid "Edit the log message or author attached to a previous commit. Read <xref linkend=\"tsvn-dug-showlog-4\"/> to find out how this works."
\r
4260 #: ../source/TortoiseGit_en.xml:5745
\r
4262 msgid "Copy the log details of the selected revisions to the clipboard. This will copy the revision number, author, date, log message and the list of changed items for each revision."
\r
4265 #: ../source/TortoiseGit_en.xml:5752
\r
4267 msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive."
\r
4270 #: ../source/TortoiseGit_en.xml:5591
\r
4272 msgid "<placeholder-1/> The top pane of the Log dialog has a context menu that allows you to access much more information. Some of these menu entries appear only when the log is shown for a file, and some only when the log is shown for a folder. <placeholder-2/>"
\r
4275 #: ../source/TortoiseGit_en.xml:5763
\r
4277 msgid "Top Pane Context Menu for 2 Selected Revisions"
\r
4280 #: ../source/TortoiseGit_en.xml:5771
\r
4282 msgid "Compare the two selected revisions using a visual difference tool. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseGit."
\r
4285 #: ../source/TortoiseGit_en.xml:5776
\r
4287 msgid "If you select this option for a folder, a further dialog pops up listing the changed files and offering you further diff options. Read more about the Compare Revisions dialog in <xref linkend=\"tsvn-dug-compare-revs\"/>."
\r
4290 #: ../source/TortoiseGit_en.xml:5784
\r
4292 msgid "Blame the two revisions and compare the blame reports using a visual difference tool. Read <xref linkend=\"tsvn-dug-blame-diffs\"/> for more detail."
\r
4295 #: ../source/TortoiseGit_en.xml:5791
\r
4297 msgid "View the differences between the two selected revisions as a Unified-Diff file. This works for files and folders."
\r
4300 #: ../source/TortoiseGit_en.xml:5797
\r
4302 msgid "Copy log messages to clipboard as described above."
\r
4305 #: ../source/TortoiseGit_en.xml:5802
\r
4307 msgid "Search log messages as described above."
\r
4310 #: ../source/TortoiseGit_en.xml:5761
\r
4312 msgid "<placeholder-1/> If you select two revisions at once (using the usual <keycap>Ctrl</keycap>-modifier), the context menu changes and gives you fewer options: <placeholder-2/>"
\r
4315 #: ../source/TortoiseGit_en.xml:5808
\r
4317 msgid "If you select two or more revisions (using the usual <keycap>Ctrl</keycap> or <keycap>Shift</keycap> modifiers), the context menu will include an entry to Revert all changes which were made in the selected revisions. This is the easiest way to rollback a group of revisions in one go."
\r
4320 #: ../source/TortoiseGit_en.xml:5815
\r
4322 msgid "You can also choose to merge the selected revisions to another working copy, as described above."
\r
4325 #: ../source/TortoiseGit_en.xml:5821
\r
4327 msgid "The Log Dialog Bottom Pane with Context Menu"
\r
4330 #: ../source/TortoiseGit_en.xml:5827
\r
4332 msgid "Show changes made in the selected revision for the selected file. This context menu is only available for files shown as <emphasis>modified</emphasis>."
\r
4335 #: ../source/TortoiseGit_en.xml:5834
\r
4337 msgid "Blame the selected revision and the previous revision for the selected file, and compare the blame reports using a visual diff tool. Read <xref linkend=\"tsvn-dug-blame-diffs\"/> for more detail."
\r
4340 #: ../source/TortoiseGit_en.xml:5842
\r
4342 #: ../source/TortoiseGit_en.xml:9586
\r
4344 msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose."
\r
4347 #: ../source/TortoiseGit_en.xml:5848
\r
4349 msgid "Revert the changes made to the selected file in that revision."
\r
4352 #: ../source/TortoiseGit_en.xml:5853
\r
4354 msgid "View the Git properties for the selected item."
\r
4357 #: ../source/TortoiseGit_en.xml:5858
\r
4359 msgid "Show the revision log for the selected single file."
\r
4362 #: ../source/TortoiseGit_en.xml:5863
\r
4364 msgid "Save the selected revision to a file so you have an older version of that file."
\r
4367 #: ../source/TortoiseGit_en.xml:5819
\r
4369 msgid "<placeholder-1/> The bottom pane of the Log dialog also has a context menu that allows you to <placeholder-2/>"
\r
4372 #: ../source/TortoiseGit_en.xml:5871
\r
4374 msgid "You may notice that sometimes we refer to changes and other times to differences. What's the difference?"
\r
4377 #: ../source/TortoiseGit_en.xml:5875
\r
4379 msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. <quote>Done in r1234</quote> means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms."
\r
4382 #: ../source/TortoiseGit_en.xml:5884
\r
4384 msgid "If you select two revisions N and M, the context menu will offer to show the <emphasis>difference</emphasis> between those two revisions. In Git terms this is <literal>diff -r M:N</literal>."
\r
4387 #: ../source/TortoiseGit_en.xml:5890
\r
4389 msgid "If you select a single revision N, the context menu will offer to show the <emphasis>changes</emphasis> made in that revision. In Git terms this is <literal>diff -r N-1:N</literal> or <literal>diff -c N</literal>."
\r
4392 #: ../source/TortoiseGit_en.xml:5896
\r
4394 msgid "The bottom pane shows the files changed in all selected revisions, so the context menu always offers to show <emphasis>changes</emphasis>."
\r
4397 #: ../source/TortoiseGit_en.xml:5903
\r
4399 msgid "Getting more log messages"
\r
4402 #: ../source/TortoiseGit_en.xml:5909
\r
4404 msgid "For a large repository there may be hundreds or even thousands of changes and fetching them all could take a long time. Normally you are only interested in the more recent changes. By default, the number of log messages fetched is limited to 100, but you can change this value in <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Settings</guimenuitem></menuchoice> (<xref linkend=\"tsvn-dug-settings-dialogs\"/>),"
\r
4407 #: ../source/TortoiseGit_en.xml:5924
\r
4409 msgid "When the <guilabel>Stop on copy/rename</guilabel> box is checked, Show Log will stop at the point that the selected file or folder was copied from somewhere else within the repository. This can be useful when looking at branches (or tags) as it stops at the root of that branch, and gives a quick indication of changes made in that branch only."
\r
4412 #: ../source/TortoiseGit_en.xml:5933
\r
4414 msgid "Normally you will want to leave this option unchecked. TortoiseGit remembers the state of the checkbox, so it will respect your preference."
\r
4417 #: ../source/TortoiseGit_en.xml:5938
\r
4419 msgid "When the Show Log dialog is invoked from within the Merge dialog, the box is always checked by default. This is because merging is most often looking at changes on branches, and going back beyond the root of the branch does not make sense in that instance."
\r
4422 #: ../source/TortoiseGit_en.xml:5945
\r
4424 msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked."
\r
4427 #: ../source/TortoiseGit_en.xml:5904
\r
4429 msgid "The Log dialog does not always show all changes ever made for a number of reasons: <placeholder-1/>"
\r
4432 #: ../source/TortoiseGit_en.xml:5954
\r
4434 msgid "If you want to see more log messages, click the <guibutton>Next 100</guibutton> to retrieve the next 100 log messages. You can repeat this as many times as needed."
\r
4437 #: ../source/TortoiseGit_en.xml:5959
\r
4439 msgid "Next to this button there is a multi-function button which remembers the last option you used it for. Click on the arrow to see the other options offered."
\r
4442 #: ../source/TortoiseGit_en.xml:5964
\r
4444 msgid "Use <guibutton>Show Range ...</guibutton> if you want to view a specific range of revisions. A dialog will then prompt you to enter the start and end revision."
\r
4447 #: ../source/TortoiseGit_en.xml:5969
\r
4449 msgid "Use <guibutton>Show All</guibutton> if you want to see <emphasis>all</emphasis> log messages from HEAD right back to revision 1."
\r
4452 #: ../source/TortoiseGit_en.xml:5975
\r
4454 msgid "Current Working Copy Revision"
\r
4457 #: ../source/TortoiseGit_en.xml:5976
\r
4459 msgid "Because the log dialog shows you the log from HEAD, not from the current working copy revision, it often happens that there are log messages shown for content which has not yet been updated in your working copy. To help make this clearer, the commit message which corresponds to the revision you have in your working copy is shown in bold."
\r
4462 #: ../source/TortoiseGit_en.xml:5984
\r
4464 msgid "By default this only works for files. This is because the update revision for a folder may not correspond to the update revision of its content, and the only way to find the effective update revision for the folder is to crawl the working copy. This can be a slow operation for large working copies so if you want to enable this feature you must create a <literal>DWORD</literal> registry key with value 1 at <literal>HKCU\\Software\\TortoiseGit\\RecursiveLogRev</literal>."
\r
4467 #: ../source/TortoiseGit_en.xml:5996
\r
4469 msgid "Merge Tracking Features"
\r
4472 #: ../source/TortoiseGit_en.xml:5998
\r
4474 msgid "merge tracking log"
\r
4477 #: ../source/TortoiseGit_en.xml:6000
\r
4479 msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development."
\r
4482 #: ../source/TortoiseGit_en.xml:6009
\r
4484 msgid "The Log Dialog Showing Merge Tracking Revisions"
\r
4487 #: ../source/TortoiseGit_en.xml:6012
\r
4489 msgid "If you want to see the detail of which revisions were merged as part of that commit, use the <guilabel>Include merged revisions</guilabel> checkbox. This will fetch the log messages again, but will also interleave the log messages from revisions which were merged. Merged revisions are shown in grey because they represent changes made on a different part of the tree."
\r
4492 #: ../source/TortoiseGit_en.xml:6020
\r
4494 msgid "Of course, merging is never simple! During feature development on the branch there will probably be occasional merges back from trunk to keep the branch in sync with the main line code. So the merge history of the branch will also include another layer of merge history. These different layers are shown in the log dialog using indentation levels."
\r
4497 #: ../source/TortoiseGit_en.xml:6030
\r
4499 msgid "Changing the Log Message and Author"
\r
4502 #: ../source/TortoiseGit_en.xml:6032
\r
4504 msgid "edit log/author"
\r
4507 #: ../source/TortoiseGit_en.xml:6034
\r
4509 msgid "Sometimes you might want to change a log message you once entered, maybe because there's a spelling error in it or you want to improve the message or change it for other reasons. Or you want to change the author of the commit because you forgot to set up authentication or..."
\r
4512 #: ../source/TortoiseGit_en.xml:6041
\r
4514 msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.reposadmin.create.html#svn.reposadmin.create.hooks\"><citetitle>Hook Scripts</citetitle></ulink> in the Git Book for details about how to do that. Read <xref linkend=\"tsvn-repository-hooks\"/> to find some further notes on implementing hooks on a Windows machine."
\r
4517 #: ../source/TortoiseGit_en.xml:6054
\r
4519 msgid "Once you've set up your server with the required hooks, you can change both author and log message of any revision, using the context menu from the top pane of the Log dialog. You can also edit a log message using the context menu for the middle pane."
\r
4522 #: ../source/TortoiseGit_en.xml:6061
\r
4524 msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the <literal>svn:log</literal> commit message property) will overwrite the previous value of that property <emphasis>forever</emphasis>."
\r
4527 #: ../source/TortoiseGit_en.xml:6071
\r
4529 msgid "Filtering Log Messages"
\r
4532 #: ../source/TortoiseGit_en.xml:6073
\r
4537 #: ../source/TortoiseGit_en.xml:6075
\r
4539 msgid "If you want to restrict the log messages to show only those you are interested in rather than scrolling through a list of hundreds, you can use the filter controls at the top of the Log Dialog. The start and end date controls allow you to restrict the output to a known date range. The search box allows you to show only messages which contain a particular phrase."
\r
4542 #: ../source/TortoiseGit_en.xml:6084
\r
4544 msgid "Click on the search icon to select which information you want to search in, and to choose <emphasis>regex</emphasis> mode. Normally you will only need a simple text search, but if you need to more flexible search terms, you can use regular expressions. If you hover the mouse over the box, a tooltip will give hints on how to use the regex functions. You can also find online documentation and a tutorial at <ulink url=\"http://www.regular-expressions.info/\"><citetitle>http://www.regular-expressions.info/</citetitle></ulink>. The filter works by checking whether your filter string matches the log entries, and then only those entries which <emphasis>match</emphasis> the filter string are shown."
\r
4547 #: ../source/TortoiseGit_en.xml:6099
\r
4549 msgid "To make the filter show all log entries that do <emphasis>not</emphasis> match the filter string, start the string with an exclamation mark ('!'). For example, a filter string <literal>!username</literal> will only show those entries which were not committed by <literal>username</literal>."
\r
4552 #: ../source/TortoiseGit_en.xml:6105
\r
4554 msgid "Note that these filters act on the messages already retrieved. They do not control downloading of messages from the repository."
\r
4557 #: ../source/TortoiseGit_en.xml:6109
\r
4559 msgid "You can also filter the path names in the bottom pane using the <guilabel>Hide unrelated changed paths</guilabel> checkbox. Related paths are those which contain the path used to display the log. If you fetch the log for a folder, that means anything in that folder or below it. For a file it means just that one file. The checkbox is tristate: you can show all paths, grey out the unrelated ones, or hide the unrelated paths completely."
\r
4562 #: ../source/TortoiseGit_en.xml:6118
\r
4564 msgid "Sometimes your working practices will require log messages to follow a particular format, which means that the text describing the changes is not visible in the abbreviated summary shown in the top pane. The property <literal>tsvn:logsummary</literal> can be used to extract a portion of the log message to be shown in the top pane. Read <xref linkend=\"tsvn-dug-propertypage-tsvn-props\"/> to find out how to use this property."
\r
4567 #: ../source/TortoiseGit_en.xml:6128
\r
4569 msgid "No Log Formatting from Repository Browser"
\r
4572 #: ../source/TortoiseGit_en.xml:6129
\r
4574 msgid "Because the formatting depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser."
\r
4577 #: ../source/TortoiseGit_en.xml:6139
\r
4579 msgid "Statistical Information"
\r
4582 #: ../source/TortoiseGit_en.xml:6141
\r
4584 msgid "statistics"
\r
4587 #: ../source/TortoiseGit_en.xml:6143
\r
4589 msgid "The <guibutton>Statistics</guibutton> button brings up a box showing some interesting information about the revisions shown in the Log dialog. This shows how many authors have been at work, how many commits they have made, progress by week, and much more. Now you can see at a glance who has been working hardest and who is slacking ;-)"
\r
4592 #: ../source/TortoiseGit_en.xml:6152
\r
4594 msgid "Statistics Page"
\r
4597 #: ../source/TortoiseGit_en.xml:6153
\r
4599 msgid "This page gives you all the numbers you can think of, in particular the period and number of revisions covered, and some min/max/average values."
\r
4602 #: ../source/TortoiseGit_en.xml:6160
\r
4604 msgid "Commits by Author Page"
\r
4607 #: ../source/TortoiseGit_en.xml:6163
\r
4609 msgid "Commits-by-Author Histogram"
\r
4612 #: ../source/TortoiseGit_en.xml:6170
\r
4614 msgid "Commits-by-Author Pie Chart"
\r
4617 #: ../source/TortoiseGit_en.xml:6161
\r
4619 msgid "<placeholder-1/> This graph shows you which authors have been active on the project as a simple histogram, stacked histogram or pie chart. <placeholder-2/>"
\r
4622 #: ../source/TortoiseGit_en.xml:6174
\r
4624 msgid "Where there are a few major authors and many minor contributors, the number of tiny segments can make the graph more difficult to read. The slider at the bottom allows you to set a threshold (as a percentage of total commits) below which any activity is grouped into an <emphasis>Others</emphasis> category."
\r
4627 #: ../source/TortoiseGit_en.xml:6183
\r
4629 msgid "Commits by date Page"
\r
4632 #: ../source/TortoiseGit_en.xml:6186
\r
4634 msgid "Commits-by-date Graph"
\r
4637 #: ../source/TortoiseGit_en.xml:6184
\r
4639 msgid "<placeholder-1/> This page gives you a graphical representation of project activity in terms of number of commits <emphasis>and</emphasis> author. This gives some idea of when a project is being worked on, and who was working at which time."
\r
4642 #: ../source/TortoiseGit_en.xml:6194
\r
4644 msgid "When there are several authors, you will get many lines on the graph. There are two views available here: <emphasis>normal</emphasis>, where each author's activity is relative to the base line, and <emphasis>stacked</emphasis>, where each author's activity is relative to the line underneath. The latter option avoids the lines crossing over, which can make the graph easier to read, but less easy to see one author's output."
\r
4647 #: ../source/TortoiseGit_en.xml:6204
\r
4649 msgid "By default the analysis is case-sensitive, so users <literal>PeterEgan</literal> and <literal>PeteRegan</literal> are treated as different authors. However, in many cases user names are not case-sensitive, and are sometimes entered inconsistently, so you may want <literal>DavidMorgan</literal> and <literal>davidmorgan</literal> to be treated as the same person. Use the <guilabel>Authors case insensitive</guilabel> checkbox to control how this is handled."
\r
4652 #: ../source/TortoiseGit_en.xml:6214
\r
4654 msgid "Note that the statistics cover the same period as the Log dialog. If that is only displaying one revision then the statistics will not tell you very much."
\r
4657 #: ../source/TortoiseGit_en.xml:6222
\r
4659 msgid "Offline Mode"
\r
4662 #: ../source/TortoiseGit_en.xml:6223
\r
4664 msgid "If the server is not reachable, and you have log caching enabled you can use the log dialog and revision graph in offline mode. This uses data from the cache, which allows you to continue working although the information may not be up-to-date or even complete."
\r
4667 #: ../source/TortoiseGit_en.xml:6231
\r
4669 #: ../source/TortoiseGit_en.xml:10140
\r
4671 msgid "Refreshing the View"
\r
4674 #: ../source/TortoiseGit_en.xml:6232
\r
4676 msgid "If you want to check the server again for newer log messages, you can simply refresh the view using <keycap>F5</keycap>. If you are using the log cache (enabled by default), this will check the repository for newer messages and fetch only the new ones. If the log cache was in offline mode, this will also attempt to go back online."
\r
4679 #: ../source/TortoiseGit_en.xml:6240
\r
4681 msgid "If you are using the log cache and you think the message content or author may have changed, you can use <keycap>Shift-F5</keycap> or <keycap>Ctrl-F5</keycap> to re-fetch the displayed messages from the server and update the log cache. Note that this only affects messages currently shown and does not invalidate the entire cache for that repository."
\r
4684 #: ../source/TortoiseGit_en.xml:6251
\r
4686 msgid "Viewing Differences"
\r
4689 #: ../source/TortoiseGit_en.xml:6253
\r
4691 #: ../source/TortoiseGit_en.xml:9177
\r
4696 #: ../source/TortoiseGit_en.xml:6256
\r
4701 #: ../source/TortoiseGit_en.xml:6258
\r
4703 msgid "One of the commonest requirements in project development is to see what has changed. You might want to look at the differences between two revisions of the same file, or the differences between two separate files. TortoiseGit provides a built-in tool named <application>TortoiseMerge</application> for viewing differences of text files. For viewing differences of image files, TortoiseGit also has a tool named <application>TortoiseIDiff</application>. Of course, you can use your own favourite diff program if you like."
\r
4706 #: ../source/TortoiseGit_en.xml:6272
\r
4708 msgid "File Differences"
\r
4711 #: ../source/TortoiseGit_en.xml:6275
\r
4713 msgid "Local changes"
\r
4716 #: ../source/TortoiseGit_en.xml:6277
\r
4718 msgid "If you want to see what changes <emphasis>you</emphasis> have made in your working copy, just use the explorer context menu and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff</guimenuitem></menuchoice>."
\r
4721 #: ../source/TortoiseGit_en.xml:6289
\r
4723 msgid "Difference to another branch/tag"
\r
4726 #: ../source/TortoiseGit_en.xml:6291
\r
4728 msgid "If you want to see what has changed on trunk (if you are working on a branch) or on a specific branch (if you are working on trunk), you can use the explorer context menu. Just hold down the <keycap>Shift</keycap> key while you right click on the file. Then select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff with URL</guimenuitem></menuchoice>. In the following dialog, specify the URL in the repository with which you want to compare your local file to."
\r
4731 #: ../source/TortoiseGit_en.xml:6304
\r
4733 msgid "You can also use the repository browser and select two trees to diff, perhaps two tags, or a branch/tag and trunk. The context menu there allows you to compare them using <guimenuitem>Compare revisions</guimenuitem>. Read more in <xref linkend=\"tsvn-dug-compare-revs\"/>."
\r
4736 #: ../source/TortoiseGit_en.xml:6314
\r
4738 msgid "Difference from a previous revision"
\r
4741 #: ../source/TortoiseGit_en.xml:6316
\r
4743 msgid "If you want to see the difference between a particular revision and your working copy, use the Revision Log dialog, select the revision of interest, then select <guimenuitem>Compare with working copy</guimenuitem> from the context menu."
\r
4746 #: ../source/TortoiseGit_en.xml:6323
\r
4748 msgid "If you want to see the difference between the last committed revision and your working copy, assuming that the working copy hasn't been modified, just right click on the file. Then select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff with previous version</guimenuitem></menuchoice>. This will perform a diff between the revision before the last-commit-date (as recorded in your working copy) and the working BASE. This shows you the last change made to that file to bring it to the state you now see in your working copy. It will not show changes newer than your working copy."
\r
4751 #: ../source/TortoiseGit_en.xml:6340
\r
4753 msgid "Difference between two previous revisions"
\r
4756 #: ../source/TortoiseGit_en.xml:6342
\r
4758 msgid "If you want to see the difference between two revisions which are already committed, use the Revision Log dialog and select the two revisions you want to compare (using the usual <keycap>Ctrl</keycap>-modifier). Then select <guimenuitem>Compare revisions</guimenuitem> from the context menu."
\r
4761 #: ../source/TortoiseGit_en.xml:6350
\r
4763 msgid "If you did this from the revision log for a folder, a Compare Revisions dialog appears, showing a list of changed files in that folder. Read more in <xref linkend=\"tsvn-dug-compare-revs\"/>."
\r
4766 #: ../source/TortoiseGit_en.xml:6359
\r
4768 msgid "All changes made in a commit"
\r
4771 #: ../source/TortoiseGit_en.xml:6361
\r
4773 msgid "If you want to see the changes made to all files in a particular revision in one view, you can use Unified-Diff output (GNU patch format). This shows only the differences with a few lines of context. It is harder to read than a visual file compare, but will show all the changes together. From the Revision Log dialog select the revision of interest, then select <guimenuitem>Show Differences as Unified-Diff</guimenuitem> from the context menu."
\r
4776 #: ../source/TortoiseGit_en.xml:6375
\r
4778 msgid "Difference between files"
\r
4781 #: ../source/TortoiseGit_en.xml:6377
\r
4783 msgid "If you want to see the differences between two different files, you can do that directly in explorer by selecting both files (using the usual <keycap>Ctrl</keycap>-modifier). Then from the explorer context menu select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff</guimenuitem></menuchoice>."
\r
4786 #: ../source/TortoiseGit_en.xml:6390
\r
4788 msgid "Difference between WC file/folder and a URL"
\r
4791 #: ../source/TortoiseGit_en.xml:6392
\r
4793 msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the <keycap>Shift</keycap> key whilst right clicking to obtain the context menu. Select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff with URL</guimenuitem></menuchoice>. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time."
\r
4796 #: ../source/TortoiseGit_en.xml:6410
\r
4798 msgid "Difference with blame information"
\r
4801 #: ../source/TortoiseGit_en.xml:6412
\r
4803 msgid "If you want to see not only the differences but also the author, revision and date that changes were made, you can combine the diff and blame reports from within the revision log dialog. Read <xref linkend=\"tsvn-dug-blame-diffs\"/> for more detail."
\r
4806 #: ../source/TortoiseGit_en.xml:6421
\r
4808 msgid "Difference between folders"
\r
4811 #: ../source/TortoiseGit_en.xml:6423
\r
4813 msgid "The built-in tools supplied with TortoiseGit do not support viewing differences between directory hierarchies. But if you have an external tool which does support that feature, you can use that instead. In <xref linkend=\"tsvn-dug-diff-tools\"/> we tell you about some tools which we have used."
\r
4816 #: ../source/TortoiseGit_en.xml:6433
\r
4818 msgid "If you have configured a third party diff tool, you can use <keycap>Shift</keycap> when selecting the Diff command to use the alternate tool. Read <xref linkend=\"tsvn-dug-settings-progs\"/> to find out about configuring other diff tools."
\r
4821 #: ../source/TortoiseGit_en.xml:6442
\r
4823 msgid "Line-end and Whitespace Options"
\r
4826 #: ../source/TortoiseGit_en.xml:6443
\r
4828 msgid "Sometimes in the life of a project you might change the line endings from <literal>CRLF</literal> to <literal>LF</literal>, or you may change the indentation of a section. Unfortunately this will mark a large number of lines as changed, even though there is no change to the meaning of the code. The options here will help to manage these changes when it comes to comparing and applying differences. You will see these settings in the <guilabel>Merge</guilabel> and <guilabel>Blame</guilabel> dialogs, as well as in the settings for TortoiseMerge."
\r
4831 #: ../source/TortoiseGit_en.xml:6454
\r
4833 msgid "<guilabel>Ignore line endings</guilabel> excludes changes which are due solely to difference in line-end style."
\r
4836 #: ../source/TortoiseGit_en.xml:6458
\r
4838 msgid "<guilabel>Compare whitespaces</guilabel> includes all changes in indentation and inline whitespace as added/removed lines."
\r
4841 #: ../source/TortoiseGit_en.xml:6463
\r
4843 msgid "<guilabel>Ignore whitespace changes</guilabel> excludes changes which are due solely to a change in the amount or type of whitespace, eg. changing the indentation or changing tabs to spaces. Adding whitespace where there was none before, or removing a whitespace completely is still shown as a change."
\r
4846 #: ../source/TortoiseGit_en.xml:6471
\r
4848 msgid "<guilabel>Ignore all whitespaces</guilabel> excludes all whitespace-only changes."
\r
4851 #: ../source/TortoiseGit_en.xml:6475
\r
4853 msgid "Naturally, any line with changed content is always included in the diff."
\r
4856 #: ../source/TortoiseGit_en.xml:6481
\r
4858 msgid "Comparing Folders"
\r
4861 #: ../source/TortoiseGit_en.xml:6483
\r
4863 msgid "compare revisions"
\r
4866 #: ../source/TortoiseGit_en.xml:6486
\r
4868 msgid "export changes"
\r
4871 #: ../source/TortoiseGit_en.xml:6490
\r
4873 msgid "The Compare Revisions Dialog"
\r
4876 #: ../source/TortoiseGit_en.xml:6488
\r
4878 msgid "<placeholder-1/> When you select two trees within the repository browser, or when you select two revisions of a folder in the log dialog, you can <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Compare revisions</guimenuitem></menuchoice>."
\r
4881 #: ../source/TortoiseGit_en.xml:6500
\r
4883 msgid "This dialog shows a list of all files which have changed and allows you to compare or blame them individually using context menu."
\r
4886 #: ../source/TortoiseGit_en.xml:6504
\r
4888 msgid "You can export a <emphasis>change tree</emphasis>, which is useful if you need to send someone else your project tree structure, but containing only the files which have changed. This operation works on the selected files only, so you need to select the files of interest - usually that means all of them - and then <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Export selection to...</guimenuitem></menuchoice>. You will be prompted for a location to save the change tree."
\r
4891 #: ../source/TortoiseGit_en.xml:6517
\r
4893 msgid "You can also export the <emphasis>list</emphasis> of changed files to a text file using <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Save list of selected files to...</guimenuitem></menuchoice>."
\r
4896 #: ../source/TortoiseGit_en.xml:6525
\r
4898 msgid "If you want to export the list of files <emphasis>and</emphasis> the actions (modified, added, deleted) as well, you can do that using <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Copy selection to clipboard</guimenuitem></menuchoice>."
\r
4901 #: ../source/TortoiseGit_en.xml:6533
\r
4903 msgid "The button at the top allows you to change the direction of comparison. You can show the changes need to get from A to B, or if you prefer, from B to A."
\r
4906 #: ../source/TortoiseGit_en.xml:6538
\r
4908 msgid "The buttons with the revision numbers on can be used to change to a different revision range. When you change the range, the list of items which differ between the two revisions will be updated automatically."
\r
4911 #: ../source/TortoiseGit_en.xml:6543
\r
4913 msgid "If the list of filenames is very long, you can use the search box to reduce the list to filenames containing specific text. Note that a simple text search is used, so if you want to restrict the list to C source files you should enter <filename>.c</filename> rather than <filename>*.c</filename>."
\r
4916 #: ../source/TortoiseGit_en.xml:6552
\r
4918 msgid "Diffing Images Using TortoiseIDiff"
\r
4921 #: ../source/TortoiseGit_en.xml:6554
\r
4923 msgid "image diff"
\r
4926 #: ../source/TortoiseGit_en.xml:6557
\r
4928 msgid "TortoiseIDiff"
\r
4931 #: ../source/TortoiseGit_en.xml:6559
\r
4933 msgid "There are many tools available for diffing text files, including our own TortoiseMerge, but we often find ourselves wanting to see how an image file has changed too. That's why we created TortoiseIDiff."
\r
4936 #: ../source/TortoiseGit_en.xml:6566
\r
4938 msgid "The image difference viewer"
\r
4941 #: ../source/TortoiseGit_en.xml:6564
\r
4943 msgid "<placeholder-1/><menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff</guimenuitem></menuchoice> for any of the common image file formats will start TortoiseIDiff to show image differences. By default the images are displayed side-by-side but you can use the View menu or toolbar to switch to a top-bottom view instead, or if you prefer, you can overlay the images and pretend you are using a lightbox."
\r
4946 #: ../source/TortoiseGit_en.xml:6579
\r
4948 msgid "Naturally you can also zoom in and out and pan around the image. You can also pan the image simply by left-dragging it. If you select the <guilabel>Link images together</guilabel> option, then the pan controls (scrollbars, mousewheel) on both images are linked."
\r
4951 #: ../source/TortoiseGit_en.xml:6585
\r
4953 msgid "An image info box shows details about the image file, such as the size in pixels, resolution and colour depth. If this box gets in the way, use <menuchoice><guimenu>View</guimenu><guimenuitem>Image Info</guimenuitem></menuchoice> to hide it. You can get the same information in a tooltip if you hover the mouse over the image title bar."
\r
4956 #: ../source/TortoiseGit_en.xml:6597
\r
4958 msgid "When the images are overlaid, the relative intensity of the images (alpha blend) is controlled by a slider control at the left side. You can click anywhere in the slider to set the blend directly, or you can drag the slider to change the blend interactively. <keycap>Ctrl+Shift</keycap>-<action>Wheel</action> to change the blend."
\r
4961 #: ../source/TortoiseGit_en.xml:6604
\r
4963 msgid "The button above the slider toggles between two preset blends, indicated by the markers on either side of the blend slider. By default one is at the top and the other at the bottom, so the toggle button just switches between one image and the other. You can move the markers to choose the two blend values that the toggle button will use."
\r
4966 #: ../source/TortoiseGit_en.xml:6611
\r
4968 msgid "Sometimes you want to see a difference rather than a blend. You might have the image files for two revisions of a printed circuit board and want to see which tracks have changed. If you disable alpha blend mode, the difference will be shown as an <emphasis>XOR</emphasis> of the pixel colour values. Unchanged areas will be plain white and changes will be coloured."
\r
4971 #: ../source/TortoiseGit_en.xml:6621
\r
4973 msgid "External Diff/Merge Tools"
\r
4976 #: ../source/TortoiseGit_en.xml:6623
\r
4978 msgid "diff tools"
\r
4981 #: ../source/TortoiseGit_en.xml:6626
\r
4983 msgid "merge tools"
\r
4986 #: ../source/TortoiseGit_en.xml:6628
\r
4988 msgid "If the tools we provide don't do what you need, try one of the many open-source or commercial programs available. Everyone has their own favourites, and this list is by no means complete, but here are a few that you might consider:"
\r
4991 #: ../source/TortoiseGit_en.xml:6636
\r
4996 #: ../source/TortoiseGit_en.xml:6638
\r
4998 msgid "<ulink url=\"http://winmerge.sourceforge.net/\"><citetitle>WinMerge</citetitle></ulink> is a great open-source diff tool which can also handle directories."
\r
5001 #: ../source/TortoiseGit_en.xml:6648
\r
5003 msgid "Perforce Merge"
\r
5006 #: ../source/TortoiseGit_en.xml:6650
\r
5008 msgid "Perforce is a commercial RCS, but you can download the diff/merge tool for free. Get more information from <ulink url=\"http://www.perforce.com/perforce/products/merge.html\"><citetitle>Perforce</citetitle></ulink>."
\r
5011 #: ../source/TortoiseGit_en.xml:6660
\r
5016 #: ../source/TortoiseGit_en.xml:6662
\r
5018 msgid "KDiff3 is a free diff tool which can also handle directories. You can download it from <ulink url=\"http://kdiff3.sf.net/\"><citetitle>here</citetitle></ulink>."
\r
5021 #: ../source/TortoiseGit_en.xml:6672
\r
5026 #: ../source/TortoiseGit_en.xml:6674
\r
5028 msgid "ExamDiff Standard is freeware. It can handle files but not directories. ExamDiff Pro is shareware and adds a number of goodies including directory diff and editing capability. In both flavours, version 3.2 and above can handle unicode. You can download them from <ulink url=\"http://www.prestosoft.com/\"><citetitle>PrestoSoft</citetitle></ulink>."
\r
5031 #: ../source/TortoiseGit_en.xml:6689
\r
5033 msgid "Beyond Compare"
\r
5036 #: ../source/TortoiseGit_en.xml:6691
\r
5038 msgid "Similar to ExamDiff Pro, this is an excellent shareware diff tool which can handle directory diffs and unicode. Download it from <ulink url=\"http://www.scootersoftware.com/\"><citetitle>Scooter Software</citetitle></ulink>."
\r
5041 #: ../source/TortoiseGit_en.xml:6702
\r
5043 msgid "Araxis Merge"
\r
5046 #: ../source/TortoiseGit_en.xml:6704
\r
5048 msgid "Araxis Merge is a useful commercial tool for diff and merging both files and folders. It does three-way comparison in merges and has synchronization links to use if you've changed the order of functions. Download it from <ulink url=\"http://www.araxis.com/merge/index.html\"><citetitle>Araxis</citetitle></ulink>."
\r
5051 #: ../source/TortoiseGit_en.xml:6716
\r
5056 #: ../source/TortoiseGit_en.xml:6718
\r
5058 msgid "This text editor includes syntax colouring for unified diffs, making them much easier to read. Download it from <ulink url=\"http://www.scintilla.org/SciTEDownload.html\"><citetitle>Scintilla</citetitle></ulink>."
\r
5061 #: ../source/TortoiseGit_en.xml:6728
\r
5066 #: ../source/TortoiseGit_en.xml:6730
\r
5068 msgid "Notepad2 is designed as a replacement for the standard Windows Notepad program, and is based on the Scintilla open-source edit control. As well as being good for viewing unified diffs, it is much better than the Windows notepad for most jobs. Download it for free <ulink url=\"http://www.flos-freeware.ch/notepad2.html\"><citetitle>here</citetitle></ulink>."
\r
5071 #: ../source/TortoiseGit_en.xml:6743
\r
5073 msgid "Read <xref linkend=\"tsvn-dug-settings-progs\"/> for information on how to set up TortoiseGit to use these tools."
\r
5076 #: ../source/TortoiseGit_en.xml:6750
\r
5078 msgid "Adding New Files And Directories"
\r
5081 #: ../source/TortoiseGit_en.xml:6752
\r
5086 #: ../source/TortoiseGit_en.xml:6755
\r
5088 msgid "version new files"
\r
5091 #: ../source/TortoiseGit_en.xml:6760
\r
5093 #: ../source/TortoiseGit_en.xml:6940
\r
5095 msgid "Explorer context menu for unversioned files"
\r
5098 #: ../source/TortoiseGit_en.xml:6758
\r
5100 msgid "<placeholder-1/> If you created new files and/or directories during your development process then you need to add them to source control too. Select the file(s) and/or directory and use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Add</guimenuitem></menuchoice>."
\r
5103 #: ../source/TortoiseGit_en.xml:6772
\r
5105 msgid "After you added the files/directories to source control the file appears with a <literal>added</literal> icon overlay which means you first have to commit your working copy to make those files/directories available to other developers. Adding a file/directory does <emphasis>not</emphasis> affect the repository!"
\r
5108 #: ../source/TortoiseGit_en.xml:6781
\r
5113 #: ../source/TortoiseGit_en.xml:6782
\r
5115 msgid "You can also use the Add command on already versioned folders. In that case, the add dialog will show you all unversioned files inside that versioned folder. This helps if you have many new files and need to add them all at once."
\r
5118 #: ../source/TortoiseGit_en.xml:6795
\r
5120 msgid "select the files you want to add"
\r
5123 #: ../source/TortoiseGit_en.xml:6800
\r
5125 #: ../source/TortoiseGit_en.xml:7236
\r
5127 msgid "<action>right-drag</action> them to the new location inside the working copy"
\r
5130 #: ../source/TortoiseGit_en.xml:6806
\r
5132 #: ../source/TortoiseGit_en.xml:7242
\r
5134 msgid "release the right mouse button"
\r
5137 #: ../source/TortoiseGit_en.xml:6811
\r
5139 msgid "select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Add files to this WC</guimenuitem></menuchoice>. The files will then be copied to the working copy and added to version control."
\r
5142 #: ../source/TortoiseGit_en.xml:6790
\r
5144 msgid "To add files from outside your working copy you can use the drag-and-drop handler: <placeholder-1/>"
\r
5147 #: ../source/TortoiseGit_en.xml:6823
\r
5149 msgid "You can also add files within a working copy simply by left-dragging and dropping them onto the commit dialog."
\r
5152 #: ../source/TortoiseGit_en.xml:6827
\r
5154 msgid "If you add a file or folder by mistake, you can undo the addition before you commit using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Undo add...</guimenuitem></menuchoice>."
\r
5157 #: ../source/TortoiseGit_en.xml:6837
\r
5159 msgid "Copying/Moving/Renaming Files and Folders"
\r
5162 #: ../source/TortoiseGit_en.xml:6839
\r
5164 msgid "copy files"
\r
5167 #: ../source/TortoiseGit_en.xml:6842
\r
5169 msgid "rename files"
\r
5172 #: ../source/TortoiseGit_en.xml:6845
\r
5174 msgid "move files"
\r
5177 #: ../source/TortoiseGit_en.xml:6848
\r
5179 #: ../source/TortoiseGit_en.xml:8057
\r
5184 #: ../source/TortoiseGit_en.xml:6851
\r
5186 #: ../source/TortoiseGit_en.xml:8060
\r
5191 #: ../source/TortoiseGit_en.xml:6853
\r
5193 msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git."
\r
5196 #: ../source/TortoiseGit_en.xml:6861
\r
5198 msgid "The easiest way to copy files and folders from within a working copy is to use the right-drag menu. When you <action>right-drag</action> a file or folder from one working copy to another, or even within the same folder, a context menu appears when you release the mouse. <placeholder-1/> Now you can copy existing versioned content to a new location, possibly renaming it at the same time."
\r
5201 #: ../source/TortoiseGit_en.xml:6873
\r
5203 msgid "You can also copy or move versioned files within a working copy, or between two working copies, using the familiar cut-and-paste method. Use the standard Windows <action>Copy</action> or <action>Cut</action> to copy one or more versioned items to the clipboard. If the clipboard contains such versioned items, you can then use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice> (note: not the standard Windows <action>Paste</action>) to copy or move those items to the new working copy location."
\r
5206 #: ../source/TortoiseGit_en.xml:6885
\r
5208 msgid "You can copy files and folders from your working copy to another location in the repository using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Branch/Tag</guimenuitem></menuchoice>. Refer to <xref linkend=\"tsvn-dug-branch-1\"/> to find out more."
\r
5211 #: ../source/TortoiseGit_en.xml:6894
\r
5213 msgid "You can locate an older version of a file or folder in the log dialog and copy it to a new location in the repository directly from the log dialog using <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Create branch/tag from revision</guimenuitem></menuchoice>. Refer to <xref linkend=\"tsvn-dug-showlog-2\"/> to find out more."
\r
5216 #: ../source/TortoiseGit_en.xml:6904
\r
5218 msgid "You can also use the repository browser to locate content you want, and copy it into your working copy directly from the repository, or copy between two locations within the repository. Refer to <xref linkend=\"tsvn-dug-repobrowser\"/> to find out more."
\r
5221 #: ../source/TortoiseGit_en.xml:6911
\r
5223 msgid "Cannot copy between repositories"
\r
5226 #: ../source/TortoiseGit_en.xml:6912
\r
5228 msgid "Whilst you can copy and files and folders <emphasis>within</emphasis> a repository, you <emphasis>cannot</emphasis> copy or move from one repository to another while preserving history using TortoiseGit. Not even if the repositories live on the same server. All you can do is copy the content in its current state and add it as new content to the second repository."
\r
5231 #: ../source/TortoiseGit_en.xml:6920
\r
5233 msgid "If you are uncertain whether two URLs on the same server refer to the same or different repositories, use the repo browser to open one URL and find out where the repository root is. If you can see both locations in one repo browser window then they are in the same repository."
\r
5236 #: ../source/TortoiseGit_en.xml:6930
\r
5238 msgid "Ignoring Files And Directories"
\r
5241 #: ../source/TortoiseGit_en.xml:6932
\r
5246 #: ../source/TortoiseGit_en.xml:6935
\r
5248 msgid "unversioned files/folders"
\r
5251 #: ../source/TortoiseGit_en.xml:6938
\r
5253 msgid "<placeholder-1/> In most projects you will have files and folders that should not be subject to version control. These might include files created by the compiler, <filename>*.obj, *.lst</filename>, maybe an output folder used to store the executable. Whenever you commit changes, TortoiseGit shows your unversioned files, which fills up the file list in the commit dialog. Of course you can turn off this display, but then you might forget to add a new source file."
\r
5256 #: ../source/TortoiseGit_en.xml:6951
\r
5258 msgid "The best way to avoid these problems is to add the derived files to the project's ignore list. That way they will never show up in the commit dialog, but genuine unversioned source files will still be flagged up."
\r
5261 #: ../source/TortoiseGit_en.xml:6957
\r
5263 msgid "If you <action>right click</action> on a single unversioned file, and select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Add to Ignore List</guimenuitem></menuchoice> from the context menu, a submenu appears allowing you to select just that file, or all files with the same extension. If you select multiple files, there is no submenu and you can only add those specific files/folders."
\r
5266 #: ../source/TortoiseGit_en.xml:6969
\r
5268 msgid "If you want to remove one or more items from the ignore list, <action>right click</action> on those items and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Remove from Ignore List</guimenuitem></menuchoice> You can also access a folder's <literal>svn:ignore</literal> property directly. That allows you to specify more general patterns using filename globbing, described in the section below. Read <xref linkend=\"tsvn-dug-propertypage\"/> for more information on setting properties directly. Please be aware that each ignore pattern has to be placed on a separate line. Separating them by spaces does not work."
\r
5271 #: ../source/TortoiseGit_en.xml:6984
\r
5273 msgid "The Global Ignore List"
\r
5276 #: ../source/TortoiseGit_en.xml:6985
\r
5278 msgid "Another way to ignore files is to add them to the <firstterm>global ignore list</firstterm>. The big difference here is that the global ignore list is a client property. It applies to <emphasis>all</emphasis> Git projects, but on the client PC only. In general it is better to use the <filename>svn:ignore</filename> property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read <xref linkend=\"tsvn-dug-settings-main\"/> for more information."
\r
5281 #: ../source/TortoiseGit_en.xml:6998
\r
5283 msgid "Ignoring Versioned Items"
\r
5286 #: ../source/TortoiseGit_en.xml:6999
\r
5288 msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read <xref linkend=\"tsvn-howto-unversion\"/> for instructions on how to <quote>unversion</quote> it."
\r
5291 #: ../source/TortoiseGit_en.xml:7007
\r
5293 msgid "Pattern Matching in Ignore Lists"
\r
5296 #: ../source/TortoiseGit_en.xml:7009
\r
5301 #: ../source/TortoiseGit_en.xml:7012
\r
5303 msgid "pattern matching"
\r
5306 #: ../source/TortoiseGit_en.xml:7021
\r
5311 #: ../source/TortoiseGit_en.xml:7023
\r
5313 msgid "Matches any string of characters, including the empty string (no characters)."
\r
5316 #: ../source/TortoiseGit_en.xml:7030
\r
5321 #: ../source/TortoiseGit_en.xml:7032
\r
5323 msgid "Matches any single character."
\r
5326 #: ../source/TortoiseGit_en.xml:7038
\r
5331 #: ../source/TortoiseGit_en.xml:7040
\r
5333 msgid "Matches any one of the characters enclosed in the square brackets. Within the brackets, a pair of characters separated by <quote>-</quote> matches any character lexically between the two. For example <literal>[AGm-p]</literal> matches any one of <literal>A</literal>, <literal>G</literal>, <literal>m</literal>, <literal>n</literal>, <literal>o</literal> or <literal>p</literal>."
\r
5336 #: ../source/TortoiseGit_en.xml:7014
\r
5338 msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: <placeholder-1/>"
\r
5341 #: ../source/TortoiseGit_en.xml:7054
\r
5343 msgid "Pattern matching is case sensitive, which can cause problems on Windows. You can force case insensitivity the hard way by pairing characters, eg. to ignore <literal>*.tmp</literal> regardless of case, you could use a pattern like <literal>*.[Tt][Mm][Pp]</literal>."
\r
5346 #: ../source/TortoiseGit_en.xml:7061
\r
5348 msgid "If you want an official definition for globbing, you can find it in the IEEE specifications for the shell command language <ulink url=\"http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13\"><citetitle>Pattern Matching Notation</citetitle></ulink>."
\r
5351 #: ../source/TortoiseGit_en.xml:7069
\r
5353 msgid "No Paths in Global Ignore List"
\r
5356 #: ../source/TortoiseGit_en.xml:7070
\r
5358 msgid "You should not include path information in your pattern. The pattern matching is intended to be used against plain file names and folder names. If you want to ignore all <literal>CVS</literal> folders, just add <literal>CVS</literal> to the ignore list. There is no need to specify <literal>CVS */CVS</literal> as you did in earlier versions. If you want to ignore all <literal>tmp</literal> folders when they exist within a <literal>prog</literal> folder but not within a <literal>doc</literal> folder you should use the <literal>svn:ignore</literal> property instead. There is no reliable way to achieve this using global ignore patterns."
\r
5361 #: ../source/TortoiseGit_en.xml:7088
\r
5363 msgid "Deleting, Moving and Renaming"
\r
5366 #: ../source/TortoiseGit_en.xml:7094
\r
5368 msgid "Explorer context menu for versioned files"
\r
5371 #: ../source/TortoiseGit_en.xml:7089
\r
5373 msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. <placeholder-1/>"
\r
5376 #: ../source/TortoiseGit_en.xml:7099
\r
5378 msgid "Deleting files and folders"
\r
5381 #: ../source/TortoiseGit_en.xml:7101
\r
5386 #: ../source/TortoiseGit_en.xml:7104
\r
5391 #: ../source/TortoiseGit_en.xml:7106
\r
5393 msgid "Use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice> to remove files or folders from Git."
\r
5396 #: ../source/TortoiseGit_en.xml:7114
\r
5398 msgid "When you <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice> a file, it is removed from your working copy immediately as well as being marked for deletion in the repository on next commit. The file's parent folder shows a <quote>deleted</quote> icon overlay. Up until you commit the change, you can get the file back using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revert</guimenuitem></menuchoice> on the parent folder."
\r
5401 #: ../source/TortoiseGit_en.xml:7130
\r
5403 msgid "When you <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice> a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revert</guimenuitem></menuchoice> on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit."
\r
5406 #: ../source/TortoiseGit_en.xml:7147
\r
5408 msgid "If you want to delete an item from the repository, but keep it locally as an unversioned file/folder, use <menuchoice><guimenu>Extended Context Menu</guimenu><guimenuitem>Delete (keep local)</guimenuitem></menuchoice>. You have to hold the <keycap>Shift</keycap> key while right clicking on the item in the explorer list pane (right pane) in order to see this in the extended context menu."
\r
5411 #: ../source/TortoiseGit_en.xml:7158
\r
5413 msgid "If a <emphasis>file</emphasis> is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice> so that Git doesn't have to guess what you really want to do."
\r
5416 #: ../source/TortoiseGit_en.xml:7172
\r
5418 msgid "If a <emphasis>folder</emphasis> is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice>."
\r
5421 #: ../source/TortoiseGit_en.xml:7185
\r
5423 msgid "Getting a deleted file or folder back"
\r
5426 #: ../source/TortoiseGit_en.xml:7186
\r
5428 msgid "If you have deleted a file or a folder and already committed that delete operation to the repository, then a normal <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revert</guimenuitem></menuchoice> can't bring it back anymore. But the file or folder is not lost at all. If you know the revision the file or folder got deleted (if you don't, use the log dialog to find out) open the repository browser and switch to that revision. Then select the file or folder you deleted, right-click and select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Copy to...</guimenuitem></menuchoice> as the target for that copy operation select the path to your working copy."
\r
5431 #: ../source/TortoiseGit_en.xml:7208
\r
5433 msgid "Moving files and folders"
\r
5436 #: ../source/TortoiseGit_en.xml:7210
\r
5438 #: ../source/TortoiseGit_en.xml:9549
\r
5440 #: ../source/TortoiseGit_en.xml:13663
\r
5445 #: ../source/TortoiseGit_en.xml:7213
\r
5450 #: ../source/TortoiseGit_en.xml:7216
\r
5452 msgid "If you want to do a simple in-place rename of a file or folder, use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Rename...</guimenuitem></menuchoice> Enter the new name for the item and you're done."
\r
5455 #: ../source/TortoiseGit_en.xml:7231
\r
5457 msgid "select the files or directories you want to move"
\r
5460 #: ../source/TortoiseGit_en.xml:7247
\r
5462 msgid "in the popup menu select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Move versioned files here</guimenuitem></menuchoice>"
\r
5465 #: ../source/TortoiseGit_en.xml:7225
\r
5467 msgid "If you want to move files around inside your working copy, perhaps to a different sub-folder, use the right-mouse drag-and-drop handler: <placeholder-1/>"
\r
5470 #: ../source/TortoiseGit_en.xml:7258
\r
5472 msgid "Commit the parent folder"
\r
5475 #: ../source/TortoiseGit_en.xml:7259
\r
5477 msgid "Since renames and moves are done as a delete followed by an add you must commit the parent folder of the renamed/moved file so that the deleted part of the rename/move will show up in the commit dialog. If you don't commit the removed part of the rename/move, it will stay behind in the repository and when your co-workers update, the old file will not be removed. i.e. they will have <emphasis>both</emphasis> the old and the new copies."
\r
5480 #: ../source/TortoiseGit_en.xml:7269
\r
5482 msgid "You <emphasis>must</emphasis> commit a folder rename before changing any of the files inside the folder, otherwise your working copy can get really messed up."
\r
5485 #: ../source/TortoiseGit_en.xml:7275
\r
5487 msgid "You can also use the repository browser to move items around. Read <xref linkend=\"tsvn-dug-repobrowser\"/> to find out more."
\r
5490 #: ../source/TortoiseGit_en.xml:7280
\r
5492 msgid "Do Not SVN Move Externals"
\r
5495 #: ../source/TortoiseGit_en.xml:7281
\r
5497 msgid "You should <emphasis>not</emphasis> use the TortoiseGit <guilabel>Move</guilabel> or <guilabel>Rename</guilabel> commands on a folder which has been created using <literal>svn:externals</literal>. This action would cause the external item to be deleted from its parent repository, probably upsetting many other people. If you need to move an externals folder you should use an ordinary shell move, then adjust the <literal>svn:externals</literal> properties of the source and destination parent folders."
\r
5500 #: ../source/TortoiseGit_en.xml:7296
\r
5502 msgid "Changing case in a filename"
\r
5505 #: ../source/TortoiseGit_en.xml:7298
\r
5507 msgid "case change"
\r
5510 #: ../source/TortoiseGit_en.xml:7301
\r
5512 msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command."
\r
5515 #: ../source/TortoiseGit_en.xml:7307
\r
5517 msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!"
\r
5520 #: ../source/TortoiseGit_en.xml:7317
\r
5522 msgid "Commit the changes in your working copy."
\r
5525 #: ../source/TortoiseGit_en.xml:7322
\r
5527 msgid "Rename the file from UPPERcase to upperCASE directly in the repository using the repository browser."
\r
5530 #: ../source/TortoiseGit_en.xml:7328
\r
5532 msgid "Update your working copy."
\r
5535 #: ../source/TortoiseGit_en.xml:7313
\r
5537 msgid "Solution A) (recommended) <placeholder-1/>"
\r
5540 #: ../source/TortoiseGit_en.xml:7338
\r
5542 msgid "Rename from UPPERcase to UPPERcase_ with the rename command in the TortoiseGit submenu."
\r
5545 #: ../source/TortoiseGit_en.xml:7344
\r
5547 #: ../source/TortoiseGit_en.xml:7354
\r
5549 msgid "Commit the changes."
\r
5552 #: ../source/TortoiseGit_en.xml:7349
\r
5554 msgid "Rename from UPPERcase_ to upperCASE."
\r
5557 #: ../source/TortoiseGit_en.xml:7334
\r
5559 msgid "Solution B) <placeholder-1/>"
\r
5562 #: ../source/TortoiseGit_en.xml:7362
\r
5564 msgid "Dealing with filename case conflicts"
\r
5567 #: ../source/TortoiseGit_en.xml:7363
\r
5569 msgid "If the repository already contains two files with the same name but differing only in case (e.g. <filename>TEST.TXT</filename> and <filename>test.txt</filename>), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not."
\r
5572 #: ../source/TortoiseGit_en.xml:7371
\r
5574 msgid "This sometimes happens when two people commit, from separate working copies, files which happen to have the same name, but with a case difference. It can also happen when files are committed from a system with a case-sensitive file system, like Linux."
\r
5577 #: ../source/TortoiseGit_en.xml:7378
\r
5579 msgid "In that case, you have to decide which one of them you want to keep and delete (or rename) the other one from the repository."
\r
5582 #: ../source/TortoiseGit_en.xml:7383
\r
5584 msgid "Preventing two files with the same name"
\r
5587 #: ../source/TortoiseGit_en.xml:7384
\r
5589 msgid "There is a server hook script available at: <ulink url=\"http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/\"><citetitle>http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/</citetitle></ulink> that will prevent checkins which result in case conflicts."
\r
5592 #: ../source/TortoiseGit_en.xml:7394
\r
5594 msgid "Repairing File Renames"
\r
5597 #: ../source/TortoiseGit_en.xml:7395
\r
5599 msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related."
\r
5602 #: ../source/TortoiseGit_en.xml:7403
\r
5604 msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the <guilabel>Commit</guilabel> and <guilabel>Check for Modifications</guilabel> dialogs. Simply select both the old name (missing) and the new name (unversioned) and use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Repair Move</guimenuitem></menuchoice> to pair the two files as a rename."
\r
5607 #: ../source/TortoiseGit_en.xml:7417
\r
5609 msgid "Deleting Unversioned Files"
\r
5612 #: ../source/TortoiseGit_en.xml:7418
\r
5614 msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks."
\r
5617 #: ../source/TortoiseGit_en.xml:7425
\r
5619 msgid "TortoiseGit provides just such an option using <menuchoice><guimenu>Extended Context Menu</guimenu><guimenuitem>Delete unversioned items...</guimenuitem></menuchoice>. You have to hold the <keycap>Shift</keycap> while right clicking on a folder in the explorer list pane (right pane) in order to see this in the extended context menu. This will produce a dialog which lists all unversioned files anywhere in your working copy. You can then select or deselect items to be removed."
\r
5622 #: ../source/TortoiseGit_en.xml:7437
\r
5624 msgid "When such items are deleted, the recycle bin is used, so if you make a mistake here and delete a file that should have been versioned, you can still recover it."
\r
5627 #: ../source/TortoiseGit_en.xml:7445
\r
5629 msgid "Undo Changes"
\r
5632 #: ../source/TortoiseGit_en.xml:7447
\r
5634 #: ../source/TortoiseGit_en.xml:13796
\r
5639 #: ../source/TortoiseGit_en.xml:7450
\r
5644 #: ../source/TortoiseGit_en.xml:7465
\r
5646 msgid "Revert dialog"
\r
5649 #: ../source/TortoiseGit_en.xml:7452
\r
5651 msgid "If you want to undo all changes you made in a file since the last update you need to select the file, <action>right click</action> to pop up the context menu and then select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revert</guimenuitem></menuchoice> A dialog will pop up showing you the files that you've changed and can revert. Select those you want to revert and click on <guibutton>OK</guibutton>. <placeholder-1/>"
\r
5654 #: ../source/TortoiseGit_en.xml:7469
\r
5656 msgid "If you want to undo a deletion or a rename, you need to use Revert on the parent folder as the deleted item does not exist for you to right-click on."
\r
5659 #: ../source/TortoiseGit_en.xml:7474
\r
5661 msgid "If you want to undo the addition of an item, this appears in the context menu as <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Undo add...</guimenuitem></menuchoice>. This is really a revert as well, but the name has been changed to make it more obvious."
\r
5664 #: ../source/TortoiseGit_en.xml:7484
\r
5666 #: ../source/TortoiseGit_en.xml:9224
\r
5668 msgid "The columns in this dialog can be customized in the same way as the columns in the <guilabel>Check for modifications</guilabel> dialog. Read <xref linkend=\"tsvn-dug-wcstatus-2\"/> for further details."
\r
5671 #: ../source/TortoiseGit_en.xml:7490
\r
5673 msgid "Undoing Changes which have been Committed"
\r
5676 #: ../source/TortoiseGit_en.xml:7491
\r
5678 msgid "<menuchoice><guimenuitem>Revert</guimenuitem></menuchoice> will only undo your local changes. It does <emphasis>not</emphasis> undo any changes which have already been committed. If you want to undo all the changes which were committed in a particular revision, read <xref linkend=\"tsvn-dug-showlog\"/> for further information."
\r
5681 #: ../source/TortoiseGit_en.xml:7502
\r
5683 msgid "Revert is Slow"
\r
5686 #: ../source/TortoiseGit_en.xml:7503
\r
5688 msgid "When you revert changes you may find that the operation takes a lot longer than you expect. This is because the modified version of the file is sent to the recycle bin, so you can retrieve your changes if you reverted by mistake. However, if your recycle bin is full, Windows takes a long time to find a place to put the file. The solution is simple: either empty the recycle bin or deactivate the <guilabel>Use recycle bin when reverting</guilabel> box in TortoiseGit's settings."
\r
5691 #: ../source/TortoiseGit_en.xml:7516
\r
5693 #: ../source/TortoiseGit_en.xml:14420
\r
5695 #: ../source/TortoiseGit_en.xml:15465
\r
5697 #: ../source/TortoiseGit_en.xml:16254
\r
5702 #: ../source/TortoiseGit_en.xml:7518
\r
5707 #: ../source/TortoiseGit_en.xml:7520
\r
5709 msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Cleanup</guimenuitem></menuchoice> on the folder. It is a good idea to do this at the top level of the working copy."
\r
5712 #: ../source/TortoiseGit_en.xml:7531
\r
5714 msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these <quote>broken</quote> timestamps and restore status checks to full speed."
\r
5717 #: ../source/TortoiseGit_en.xml:7542
\r
5719 msgid "Use Commit Timestamps"
\r
5722 #: ../source/TortoiseGit_en.xml:7543
\r
5724 msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the <guilabel>Use commit timestamps</guilabel> option checked. Use the Cleanup command to speed up these working copies."
\r
5727 #: ../source/TortoiseGit_en.xml:7553
\r
5729 msgid "Project Settings"
\r
5732 #: ../source/TortoiseGit_en.xml:7555
\r
5734 msgid "properties"
\r
5737 #: ../source/TortoiseGit_en.xml:7559
\r
5739 msgid "Explorer property page, Git tab"
\r
5742 #: ../source/TortoiseGit_en.xml:7557
\r
5744 msgid "<placeholder-1/> Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select <menuchoice><guimenu>Windows Menu</guimenu><guimenuitem>properties</guimenuitem></menuchoice> in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory."
\r
5747 #: ../source/TortoiseGit_en.xml:7579
\r
5749 msgid "Git Properties"
\r
5752 #: ../source/TortoiseGit_en.xml:7581
\r
5754 msgid "Git properties"
\r
5757 #: ../source/TortoiseGit_en.xml:7587
\r
5759 msgid "Git property page"
\r
5762 #: ../source/TortoiseGit_en.xml:7585
\r
5764 msgid "<placeholder-1/> You can read and set the Git properties from the Windows properties dialog, but also from <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>properties</guimenuitem></menuchoice> and within TortoiseGit's status lists, from <menuchoice><guimenu>Context menu</guimenu><guimenuitem>properties</guimenuitem></menuchoice>."
\r
5767 #: ../source/TortoiseGit_en.xml:7602
\r
5769 msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with <literal>svn:</literal>. <literal>svn:externals</literal> is such a property; see how to handle externals in <xref linkend=\"tsvn-dug-import-4\"/>."
\r
5772 #: ../source/TortoiseGit_en.xml:7609
\r
5774 msgid "svn:keywords"
\r
5777 #: ../source/TortoiseGit_en.xml:7611
\r
5782 #: ../source/TortoiseGit_en.xml:7614
\r
5784 msgid "expand keywords"
\r
5787 #: ../source/TortoiseGit_en.xml:7624
\r
5789 msgid "Date of last known commit. This is based on information obtained when you update your working copy. It does <emphasis>not</emphasis> check the repository to find more recent changes."
\r
5792 #: ../source/TortoiseGit_en.xml:7635
\r
5794 msgid "Revision of last known commit."
\r
5797 #: ../source/TortoiseGit_en.xml:7643
\r
5799 msgid "Author who made the last known commit."
\r
5802 #: ../source/TortoiseGit_en.xml:7651
\r
5804 msgid "The full URL of this file in the repository."
\r
5807 #: ../source/TortoiseGit_en.xml:7659
\r
5809 msgid "A compressed combination of the previous four keywords."
\r
5812 #: ../source/TortoiseGit_en.xml:7616
\r
5814 msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: <placeholder-1/>"
\r
5817 #: ../source/TortoiseGit_en.xml:7667
\r
5819 msgid "To find out how to use these keywords, look at the <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html\"><citetitle>svn:keywords section</citetitle></ulink> in the Git book, which gives a full description of these keywords and how to enable and use them."
\r
5822 #: ../source/TortoiseGit_en.xml:7677
\r
5824 msgid "For more information about properties in Git see the <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.advanced.props.html\"><citetitle>Special Properties</citetitle></ulink>."
\r
5827 #: ../source/TortoiseGit_en.xml:7684
\r
5829 msgid "Adding and Editing Properties"
\r
5832 #: ../source/TortoiseGit_en.xml:7687
\r
5834 msgid "Adding properties"
\r
5837 #: ../source/TortoiseGit_en.xml:7685
\r
5839 msgid "<placeholder-1/> To add a new property, first click on <guilabel>Add...</guilabel>. Select the required property name from the combo box, or type in a name of your own choice, then enter a value in the box below. Properties which take multiple values, such as an ignore list, can be entered on multiple lines. Click on <guibutton>OK</guibutton> to add that property to the list."
\r
5842 #: ../source/TortoiseGit_en.xml:7697
\r
5844 msgid "If you want to apply a property to many items at once, select the files/folders in explorer, then select <menuchoice><guimenu>Context menu</guimenu><guimenuitem>properties</guimenuitem></menuchoice>"
\r
5847 #: ../source/TortoiseGit_en.xml:7705
\r
5849 msgid "If you want to apply the property to <emphasis>every</emphasis> file and folder in the hierarchy below the current folder, check the <guilabel>Recursive</guilabel> checkbox."
\r
5852 #: ../source/TortoiseGit_en.xml:7710
\r
5854 msgid "Some properties, for example <literal>svn:needs-lock</literal>, can only be applied to files, so the property name doesn't appear in the drop down list for folders. You can still apply such a property recursively to all files in a hierarchy, but you have to type in the property name yourself."
\r
5857 #: ../source/TortoiseGit_en.xml:7717
\r
5859 msgid "If you wish to edit an existing property, select that property from the list of existing properties, then click on <guibutton>Edit...</guibutton>."
\r
5862 #: ../source/TortoiseGit_en.xml:7721
\r
5864 msgid "If you wish to remove an existing property, select that property from the list of existing properties, then click on <guibutton>Remove</guibutton>."
\r
5867 #: ../source/TortoiseGit_en.xml:7725
\r
5869 msgid "The <literal>svn:externals</literal> property can be used to pull in other projects from the same repository or a completely different repository. For more information, read <xref linkend=\"tsvn-dug-import-4\"/>."
\r
5872 #: ../source/TortoiseGit_en.xml:7733
\r
5874 msgid "Exporting and Importing Properties"
\r
5877 #: ../source/TortoiseGit_en.xml:7734
\r
5879 msgid "Often you will find yourself applying the same set of properties many times, for example <literal>bugtraq:logregex</literal>. To simplify the process of copying properties from one project to another, you can use the Export/Import feature."
\r
5882 #: ../source/TortoiseGit_en.xml:7740
\r
5884 msgid "From the file or folder where the properties are already set, use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>properties</guimenuitem></menuchoice>, select the properties you wish to export and click on <guibutton>Export...</guibutton>. You will be prompted for a filename where the property names and values will be saved."
\r
5887 #: ../source/TortoiseGit_en.xml:7750
\r
5889 msgid "From the folder(s) where you wish to apply these properties, use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>properties</guimenuitem></menuchoice> and click on <guibutton>Import...</guibutton>. You will be prompted for a filename to import from, so navigate to the place you saved the export file previously and select it. The properties will be added to the folders non-recursively."
\r
5892 #: ../source/TortoiseGit_en.xml:7761
\r
5894 msgid "If you want to add properties to a tree recursively, follow the steps above, then in the property dialog select each property in turn, click on <guibutton>Edit...</guibutton>, check the <guilabel>Apply property recursively</guilabel> box and click on <guibutton>OK</guibutton>."
\r
5897 #: ../source/TortoiseGit_en.xml:7768
\r
5899 msgid "The Import file format is binary and proprietary to TortoiseGit. Its only purpose is to transfer properties using Import and Export, so there is no need to edit these files."
\r
5902 #: ../source/TortoiseGit_en.xml:7775
\r
5904 msgid "Binary Properties"
\r
5907 #: ../source/TortoiseGit_en.xml:7776
\r
5909 msgid "TortoiseGit can handle binary property values using files. To read a binary property value, <guibutton>Save...</guibutton> to a file. To set a binary value, use a hex editor or other appropriate tool to create a file with the content you require, then <guibutton>Load...</guibutton> from that file."
\r
5912 #: ../source/TortoiseGit_en.xml:7783
\r
5914 msgid "Although binary properties are not often used, they can be useful in some applications. For example if you are storing huge graphics files, or if the application used to load the file is huge, you might want to store a thumbnail as a property so you can obtain a preview quickly."
\r
5917 #: ../source/TortoiseGit_en.xml:7791
\r
5919 msgid "Automatic property setting"
\r
5922 #: ../source/TortoiseGit_en.xml:7793
\r
5924 msgid "auto-props"
\r
5927 #: ../source/TortoiseGit_en.xml:7795
\r
5929 msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this."
\r
5932 #: ../source/TortoiseGit_en.xml:7800
\r
5934 msgid "You can edit the Git configuration file to enable this feature on your client. The <guilabel>General</guilabel> page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed <literal>miscellany</literal> uncomment the line <literal>enable-auto-props = yes</literal>. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository."
\r
5937 #: ../source/TortoiseGit_en.xml:7817
\r
5939 msgid "An alternative method is to set the <literal>tsvn:autoprops</literal> property on folders, as described in the next section. This method only works for TortoiseGit clients, but it does get propagated to all working copies on update."
\r
5942 #: ../source/TortoiseGit_en.xml:7823
\r
5944 msgid "Whichever method you choose, you should note that auto-props are only applied to files at the time they are added to the repository. Auto-props will never change the properties of files which are already versioned."
\r
5947 #: ../source/TortoiseGit_en.xml:7829
\r
5949 msgid "If you want to be absolutely sure that new files have the correct properties applied, you should set up a repository pre-commit hook to reject commits where the required properties are not set."
\r
5952 #: ../source/TortoiseGit_en.xml:7836
\r
5954 msgid "Commit properties"
\r
5957 #: ../source/TortoiseGit_en.xml:7837
\r
5959 msgid "Git properties are versioned. After you change or add a property you have to commit your changes."
\r
5962 #: ../source/TortoiseGit_en.xml:7843
\r
5964 msgid "Conflicts on properties"
\r
5967 #: ../source/TortoiseGit_en.xml:7844
\r
5969 msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a <filename>.prej</filename> file. Delete this file after you have resolved the conflict."
\r
5972 #: ../source/TortoiseGit_en.xml:7853
\r
5974 msgid "TortoiseGit Project Properties"
\r
5977 #: ../source/TortoiseGit_en.xml:7855
\r
5979 msgid "project properties"
\r
5982 #: ../source/TortoiseGit_en.xml:7858
\r
5984 msgid "TortoiseGit properties"
\r
5987 #: ../source/TortoiseGit_en.xml:7865
\r
5989 msgid "<literal>tsvn:logminsize</literal> sets the minimum length of a log message for a commit. If you enter a shorter message than specified here, the commit is disabled. This feature is very useful for reminding you to supply a proper descriptive message for every commit. If this property is not set, or the value is zero, empty log messages are allowed."
\r
5992 #: ../source/TortoiseGit_en.xml:7874
\r
5994 msgid "<literal>tsvn:lockmsgminsize</literal> sets the minimum length of a lock message. If you enter a shorter message than specified here, the lock is disabled. This feature is very useful for reminding you to supply a proper descriptive message for every lock you get. If this property is not set, or the value is zero, empty lock messages are allowed."
\r
5997 #: ../source/TortoiseGit_en.xml:7885
\r
5999 msgid "<literal>tsvn:logwidthmarker</literal> is used with projects which require log messages to be formatted with some maximum width (typically 80 characters) before a line break. Setting this property to a non-zero will do 2 things in the log message entry dialog: it places a marker to indicate the maximum width, and it disables word wrap in the display, so that you can see whether the text you entered is too long. Note: this feature will only work correctly if you have a fixed-width font selected for log messages."
\r
6002 #: ../source/TortoiseGit_en.xml:7898
\r
6004 msgid "<literal>tsvn:logtemplate</literal> is used with projects which have rules about log message formatting. The property holds a multi-line text string which will be inserted in the commit message box when you start a commit. You can then edit it to include the required information. Note: if you are also using <literal>tsvn:logminsize</literal>, be sure to set the length longer than the template or you will lose the protection mechanism."
\r
6007 #: ../source/TortoiseGit_en.xml:7909
\r
6009 msgid "Git allows you to set <quote>autoprops</quote> which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. <literal>tsvn:autoprops</literal> can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. <literal>*.sh = svn:eol-style=native;svn:executable</literal> sets two properties on files with the <literal>.sh</literal> extension."
\r
6012 #: ../source/TortoiseGit_en.xml:7922
\r
6014 msgid "If there is a conflict between the local autoprops and <literal>tsvn:autoprops</literal>, the project settings take precedence because they are specific to that project."
\r
6017 #: ../source/TortoiseGit_en.xml:7929
\r
6019 msgid "In the Commit dialog you have the option to paste in the list of changed files, including the status of each file (added, modified, etc). <literal>tsvn:logfilelistenglish</literal> defines whether the file status is inserted in English or in the localized language. If the property is not set, the default is <literal>true</literal>."
\r
6022 #: ../source/TortoiseGit_en.xml:7940
\r
6024 msgid "TortoiseGit can use spell checker modules which are also used by OpenOffice and Mozilla. If you have those installed this property will determine which spell checker to use, i.e. in which language the log messages for your project should be written. <literal>tsvn:projectlanguage</literal> sets the language module the spell checking engine should use when you enter a log message. You can find the values for your language on this page: <ulink url=\"http://msdn2.microsoft.com/en-us/library/ms776260.aspx\"><citetitle>MSDN: Language Identifiers</citetitle></ulink>."
\r
6027 #: ../source/TortoiseGit_en.xml:7954
\r
6029 msgid "You can enter this value in decimal, or in hexadecimal if prefixed with <literal>0x</literal>. For example English (US) can be entered as <literal>0x0409</literal> or <literal>1033</literal>."
\r
6032 #: ../source/TortoiseGit_en.xml:7962
\r
6034 msgid "The property <literal>tsvn:logsummary</literal> is used to extract a portion of the log message which is then shown in the log dialog as the log message summary."
\r
6037 #: ../source/TortoiseGit_en.xml:7967
\r
6039 msgid "The value of the <literal>tsvn:logsummary</literal> property must be set to a one line regex string which contains one regex group. Whatever matches that group is used as the summary."
\r
6042 #: ../source/TortoiseGit_en.xml:7973
\r
6044 msgid "An example: <literal>\\[SUMMARY\\]:\\s+(.*)</literal> Will catch everything after <quote>[SUMMARY]</quote> in the log message and use that as the summary."
\r
6047 #: ../source/TortoiseGit_en.xml:7981
\r
6049 msgid "When you want to add a new property, you can either pick one from the list in the combo box, or you can enter any property name you like. If your project uses some custom properties, and you want those properties to appear in the list in the combo box (to avoid typos when you enter a property name), you can create a list of your custom properties using <literal>tsvn:userfileproperties</literal> and <literal>tsvn:userdirproperties</literal>. Apply these properties to a folder. When you go to edit the properties of any child item, your custom properties will appear in the list of pre-defined property names."
\r
6052 #: ../source/TortoiseGit_en.xml:7860
\r
6054 msgid "TortoiseGit has a few special properties of its own, and these begin with <literal>tsvn:</literal>. <placeholder-1/>"
\r
6057 #: ../source/TortoiseGit_en.xml:7997
\r
6059 #: ../source/TortoiseGit_en.xml:10691
\r
6061 msgid "Some <literal>tsvn:</literal> properties require a <literal>true/false</literal> value. TortoiseGit also understands <literal>yes</literal> as a synonym for <literal>true</literal> and <literal>no</literal> as a synonym for <literal>false</literal>."
\r
6064 #: ../source/TortoiseGit_en.xml:8003
\r
6066 msgid "TortoiseGit can integrate with some bug tracking tools. This uses project properties that start with <literal>bugtraq:</literal>. Read <xref linkend=\"tsvn-dug-bugtracker\"/> for further information."
\r
6069 #: ../source/TortoiseGit_en.xml:8008
\r
6071 msgid "It can also integrate with some web-based repository browsers, using project properties that start with <literal>webviewer:</literal>. Read <xref linkend=\"tsvn-dug-repoviewer\"/> for further information."
\r
6074 #: ../source/TortoiseGit_en.xml:8014
\r
6076 msgid "Set the project properties on folders"
\r
6079 #: ../source/TortoiseGit_en.xml:8015
\r
6081 msgid "These special project properties must be set on <emphasis>folders</emphasis> for the system to work. When you commit a file or folder the properties are read from that folder. If the properties are not found there, TortoiseGit will search upwards through the folder tree to find them until it comes to an unversioned folder, or the tree root (eg. <literal>C:\\</literal>) is found. If you can be sure that each user checks out only from e.g <filename>trunk/</filename> and not some sub-folder, then it is sufficient to set the properties on <filename>trunk/</filename>. If you can't be sure, you should set the properties recursively on each sub-folder. A property setting deeper in the project hierarchy overrides settings on higher levels (closer to <filename>trunk/</filename>)."
\r
6084 #: ../source/TortoiseGit_en.xml:8029
\r
6086 msgid "For project properties <emphasis>only</emphasis> you can use the <guilabel>Recursive</guilabel> checkbox to set the property to all sub-folders in the hierarchy, without also setting it on all files."
\r
6089 #: ../source/TortoiseGit_en.xml:8036
\r
6091 msgid "When you add new sub-folders using TortoiseGit, any project properties present in the parent folder will automatically be added to the new child folder too."
\r
6094 #: ../source/TortoiseGit_en.xml:8042
\r
6096 msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it."
\r
6099 #: ../source/TortoiseGit_en.xml:8055
\r
6101 msgid "Branching / Tagging"
\r
6104 #: ../source/TortoiseGit_en.xml:8063
\r
6106 #: ../source/TortoiseGit_en.xml:9546
\r
6111 #: ../source/TortoiseGit_en.xml:8066
\r
6113 msgid "mark release"
\r
6116 #: ../source/TortoiseGit_en.xml:8069
\r
6118 msgid "One of the features of version control systems is the ability to isolate changes onto a separate line of development. This line is known as a <firstterm>branch</firstterm>. Branches are often used to try out new features without disturbing the main line of development with compiler errors and bugs. As soon as the new feature is stable enough then the development branch is <firstterm>merged</firstterm> back into the main branch (trunk)."
\r
6121 #: ../source/TortoiseGit_en.xml:8079
\r
6123 msgid "Another feature of version control systems is the ability to mark particular revisions (e.g. a release version), so you can at any time recreate a certain build or environment. This process is known as <firstterm>tagging</firstterm>."
\r
6126 #: ../source/TortoiseGit_en.xml:8085
\r
6128 msgid "Git does not have special commands for branching or tagging, but uses so-called <quote>cheap copies</quote> instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository."
\r
6131 #: ../source/TortoiseGit_en.xml:8095
\r
6133 msgid "Creating a Branch or Tag"
\r
6136 #: ../source/TortoiseGit_en.xml:8100
\r
6138 msgid "The Branch/Tag Dialog"
\r
6141 #: ../source/TortoiseGit_en.xml:8096
\r
6143 msgid "If you have imported your project with the recommended directory structure, creating a branch or tag version is very simple: <placeholder-1/> Select the folder in your working copy which you want to copy to a branch or tag, then select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Branch/Tag...</guimenuitem></menuchoice>."
\r
6146 #: ../source/TortoiseGit_en.xml:8110
\r
6148 msgid "The default destination URL for the new branch will be the source URL on which your working copy is based. You will need to edit that URL to the new path for your branch/tag. So instead of <screen>\n http://svn.collab.net/repos/ProjectName/trunk\n</screen> you might now use something like <screen>\n http://svn.collab.net/repos/ProjectName/tags/Release_1.10\n</screen> If you can't remember the naming convention you used last time, click the button on the right to open the repository browser so you can view the existing repository structure."
\r
6151 #: ../source/TortoiseGit_en.xml:8131
\r
6153 #: ../source/TortoiseGit_en.xml:15511
\r
6155 msgid "HEAD revision in the repository"
\r
6158 #: ../source/TortoiseGit_en.xml:8133
\r
6160 msgid "The new branch is copied directly in the repository from the HEAD revision. No data needs to be transferred from your working copy, and the branch is created very quickly."
\r
6163 #: ../source/TortoiseGit_en.xml:8142
\r
6165 msgid "Specific revision in the repository"
\r
6168 #: ../source/TortoiseGit_en.xml:8144
\r
6170 msgid "The new branch is copied directly in the repository but you can choose an older revision. This is useful if you forgot to make a tag when you released your project last week. If you can't remember the revision number, click the button on the right to show the revision log, and select the revision number from there. Again no data is transferred from your working copy, and the branch is created very quickly."
\r
6173 #: ../source/TortoiseGit_en.xml:8159
\r
6175 msgid "The new branch is an identical copy of your local working copy. If you have updated some files to an older revision in your WC, or if you have made local changes, that is exactly what goes into the copy. Naturally this sort of complex tag may involve transferring data from your WC back to the repository if it does not exist there already."
\r
6178 #: ../source/TortoiseGit_en.xml:8126
\r
6180 msgid "Now you have to select the source of the copy. Here you have three options: <placeholder-1/>"
\r
6183 #: ../source/TortoiseGit_en.xml:8172
\r
6185 msgid "If you want your working copy to be switched to the newly created branch automatically, use the <guilabel>Switch working copy to new branch/tag</guilabel> checkbox. But if you do that, first make sure that your working copy does not contain modifications. If it does, those changes will be merged into the branch WC when you switch."
\r
6188 #: ../source/TortoiseGit_en.xml:8180
\r
6190 msgid "Press <guibutton>OK</guibutton> to commit the new copy to the repository. Don't forget to supply a log message. Note that the copy is created <emphasis>inside the repository</emphasis>."
\r
6193 #: ../source/TortoiseGit_en.xml:8185
\r
6195 msgid "Note that unless you opted to switch your working copy to the newly created branch, creating a Branch or Tag does <emphasis>not</emphasis> affect your working copy. Even if you create the branch from your WC, those changes are committed to the new branch, not to the trunk, so your WC may still be marked as modified with respect to the trunk."
\r
6198 #: ../source/TortoiseGit_en.xml:8194
\r
6200 msgid "To Checkout or to Switch..."
\r
6203 #: ../source/TortoiseGit_en.xml:8197
\r
6208 #: ../source/TortoiseGit_en.xml:8199
\r
6210 msgid "...that is (not really) the question. While a checkout downloads everything from the desired branch in the repository to your working directory, <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Switch...</guimenuitem></menuchoice> only transfers the changed data to your working copy. Good for the network load, good for your patience. :-)"
\r
6213 #: ../source/TortoiseGit_en.xml:8215
\r
6215 msgid "<menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Checkout</guimenuitem></menuchoice> to make a fresh checkout in an empty folder. You can check out to any location on your local disk and you can create as many working copies from your repository as you like."
\r
6218 #: ../source/TortoiseGit_en.xml:8227
\r
6220 msgid "Switch your current working copy to the newly created copy in the repository. Again select the top level folder of your project and use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Switch...</guimenuitem></menuchoice> from the context menu."
\r
6223 #: ../source/TortoiseGit_en.xml:8237
\r
6225 msgid "In the next dialog enter the URL of the branch you just created. Select the <guilabel>Head Revision</guilabel> radio button and click on <guibutton>OK</guibutton>. Your working copy is switched to the new branch/tag."
\r
6228 #: ../source/TortoiseGit_en.xml:8245
\r
6230 msgid "Switch works just like Update in that it never discards your local changes. Any changes you have made to your working copy which have not yet been committed will be merged when you do the Switch. If you do not want this to happen then you must either commit the changes before switching, or revert your working copy to an already-committed revision (typically HEAD)."
\r
6233 #: ../source/TortoiseGit_en.xml:8255
\r
6235 msgid "If you want to work on trunk and branch, but don't want the expense of a fresh checkout, you can use Windows Explorer to make a copy of your trunk checkout in another folder, then <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Switch...</guimenuitem></menuchoice> that copy to your new branch."
\r
6238 #: ../source/TortoiseGit_en.xml:8268
\r
6240 msgid "The Switch Dialog"
\r
6243 #: ../source/TortoiseGit_en.xml:8210
\r
6245 msgid "To be able to work with your freshly generated branch or tag you have several ways to handle it. You can: <placeholder-1/><placeholder-2/>"
\r
6248 #: ../source/TortoiseGit_en.xml:8277
\r
6250 msgid "Tags are typically used to create a static snapshot of the project at a particular stage. As such they not normally used for development - that's what branches are for, which is the reason we recommended the <filename>/trunk /branches /tags</filename> repository structure in the first place. Working on a tag revision is <emphasis>not a good idea</emphasis>, but because your local files are not write protected there is nothing to stop you doing this by mistake. However, if you try to commit to a path in the repository which contains <filename>/tags/</filename>, TortoiseGit will warn you."
\r
6253 #: ../source/TortoiseGit_en.xml:8293
\r
6255 msgid "It may be that you need to make further changes to a release which you have already tagged. The correct way to handle this is to create a new branch from the tag first and commit the branch. Do your Changes on this branch and then create a new tag from this new branch, e.g. <filename>Version_1.0.1</filename>."
\r
6258 #: ../source/TortoiseGit_en.xml:8303
\r
6260 msgid "If you modify a working copy created from a branch and commit, then all changes go to the new branch and <emphasis>not</emphasis> the trunk. Only the modifications are stored. The rest remains a cheap copy."
\r
6263 #: ../source/TortoiseGit_en.xml:8272
\r
6265 msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. <placeholder-1/>"
\r
6268 #: ../source/TortoiseGit_en.xml:8316
\r
6273 #: ../source/TortoiseGit_en.xml:8319
\r
6275 #: ../source/TortoiseGit_en.xml:8445
\r
6277 #: ../source/TortoiseGit_en.xml:8558
\r
6279 #: ../source/TortoiseGit_en.xml:8591
\r
6284 #: ../source/TortoiseGit_en.xml:8321
\r
6286 msgid "Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice versa."
\r
6289 #: ../source/TortoiseGit_en.xml:8326
\r
6291 msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html\"><citetitle>Branching and Merging</citetitle></ulink> in the Git book, which gives a full description and many examples of how it is used."
\r
6294 #: ../source/TortoiseGit_en.xml:8336
\r
6296 msgid "The next point to note is that merging <emphasis>always</emphasis> takes place within a working copy. If you want to merge changes <emphasis>into</emphasis> a branch, you have to have a working copy for that branch checked out, and invoke the merge wizard from that working copy using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Merge...</guimenuitem></menuchoice>."
\r
6299 #: ../source/TortoiseGit_en.xml:8347
\r
6301 msgid "In general it is a good idea to perform a merge into an unmodified working copy. If you have made other changes in your WC, commit those first. If the merge does not go as you expect, you may want to revert the changes, and the <guilabel>Revert</guilabel> command will discard <emphasis>all</emphasis> changes including any you made before the merge."
\r
6304 #: ../source/TortoiseGit_en.xml:8354
\r
6306 msgid "There are three common use cases for merging which are handled in slightly different ways, as described below. The first page of the merge wizard asks you to select the method you need."
\r
6309 #: ../source/TortoiseGit_en.xml:8362
\r
6311 msgid "Merge a range of revisions"
\r
6314 #: ../source/TortoiseGit_en.xml:8364
\r
6316 msgid "This method covers the case when you have made one or more revisions to a branch (or to the trunk) and you want to port those changes across to a different branch."
\r
6319 #: ../source/TortoiseGit_en.xml:8369
\r
6321 msgid "What you are asking Git to do is this: <quote>Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B).</quote>"
\r
6324 #: ../source/TortoiseGit_en.xml:8378
\r
6326 #: ../source/TortoiseGit_en.xml:8555
\r
6328 msgid "Reintegrate a branch"
\r
6331 #: ../source/TortoiseGit_en.xml:8380
\r
6333 msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes."
\r
6336 #: ../source/TortoiseGit_en.xml:8389
\r
6338 msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes."
\r
6341 #: ../source/TortoiseGit_en.xml:8399
\r
6343 msgid "After the merge, all branch development has been completely merged back into the main development line. The branch is now redundant and can be deleted."
\r
6346 #: ../source/TortoiseGit_en.xml:8404
\r
6348 msgid "Once you have performed a reintegrate merge you should not continue to use it for development. The reason for this is that if you try to resynchronize your existing branch from trunk later on, merge tracking will see your reintegration as a trunk change that has not yet been merged into the branch, and will try to merge the branch-to-trunk merge back into the branch! The solution to this is simply to create a new branch from trunk to continue the next phase of your development."
\r
6351 #: ../source/TortoiseGit_en.xml:8417
\r
6353 msgid "Merge two different trees"
\r
6356 #: ../source/TortoiseGit_en.xml:8419
\r
6358 msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: <quote>Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk).</quote> The net result is that trunk now looks exactly like the branch."
\r
6361 #: ../source/TortoiseGit_en.xml:8427
\r
6363 msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.advanced.vendorbr.html\"><citetitle>vendor branches</citetitle></ulink> in the Git Book."
\r
6366 #: ../source/TortoiseGit_en.xml:8442
\r
6368 msgid "Merging a Range of Revisions"
\r
6371 #: ../source/TortoiseGit_en.xml:8446
\r
6373 msgid "revision range"
\r
6376 #: ../source/TortoiseGit_en.xml:8450
\r
6378 msgid "The Merge Wizard - Select Revision Range"
\r
6381 #: ../source/TortoiseGit_en.xml:8448
\r
6383 msgid "<placeholder-1/> In the <guilabel>From:</guilabel> field enter the full folder URL of the branch or tag containing the changes you want to port into your working copy. You may also click <guibutton>...</guibutton> to browse the repository and find the desired branch. If you have merged from this branch before, then just use the drop down list which shows a history of previously used URLs."
\r
6386 #: ../source/TortoiseGit_en.xml:8463
\r
6388 msgid "In the <guilabel>Revision range to merge</guilabel> field enter the list of revisions you want to merge. This can be a single revision, a list of specific revisions separated by commas, or a range of revisions separated by a dash, or any combination of these."
\r
6391 #: ../source/TortoiseGit_en.xml:8471
\r
6393 msgid "There is an important difference in the way a revision range is specified with TortoiseGit compared to the command line client. The easiest way to visualise it is to think of a fence with posts and fence panels."
\r
6396 #: ../source/TortoiseGit_en.xml:8477
\r
6398 msgid "With the command line client you specify the changes to merge using two <quote>fence post</quote> revisions which specify the <emphasis>before</emphasis> and <emphasis>after</emphasis> points."
\r
6401 #: ../source/TortoiseGit_en.xml:8483
\r
6403 msgid "With TortoiseGit you specify the changeset to merge using <quote>fence panels</quote>. The reason for this becomes clear when you use the log dialog to specify revisions to merge, where each revision appears as a changeset."
\r
6406 #: ../source/TortoiseGit_en.xml:8490
\r
6408 msgid "If you are merging revisions in chunks, the method shown in the Git book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time."
\r
6411 #: ../source/TortoiseGit_en.xml:8497
\r
6413 msgid "This difference has generated a lot of heat on the mailing lists. We acknowledge that there is a difference from the command line client, but we believe that for the majority of GUI users it is easier to understand the method we have implemented."
\r
6416 #: ../source/TortoiseGit_en.xml:8505
\r
6418 msgid "The easiest way to select the range of revisions you need is to click on <guibutton>Show Log</guibutton>, as this will list recent changes with their log comments. If you want to merge the changes from a single revision, just select that revision. If you want to merge changes from several revisions, then select that range (using the usual <keycap>Shift</keycap>-modifier). Click on <guibutton>OK</guibutton> and the list of revision numbers to merge will be filled in for you."
\r
6421 #: ../source/TortoiseGit_en.xml:8516
\r
6423 msgid "If you want to merge changes back <emphasis>out</emphasis> of your working copy, to revert a change which has already been committed, select the revisions to revert and make sure the <guilabel>Reverse merge</guilabel> box is checked."
\r
6426 #: ../source/TortoiseGit_en.xml:8522
\r
6428 msgid "If you have already merged some changes from this branch, hopefully you will have made a note of the last revision merged in the log message when you committed the change. In that case, you can use <guibutton>Show Log</guibutton> for the Working Copy to trace that log message. Remembering that we are thinking of revisions as changesets, you should Use the revision after the end point of the last merge as the start point for this merge. For example, if you have merged revisions 37 to 39 last time, then the start point for this merge should be revision 40."
\r
6431 #: ../source/TortoiseGit_en.xml:8535
\r
6433 msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read <xref linkend=\"tsvn-dug-merge-tracking\"/> to find out more."
\r
6436 #: ../source/TortoiseGit_en.xml:8543
\r
6438 msgid "If other people may be committing changes then be careful about using the HEAD revision. It may not refer to the revision you think it does if someone else made a commit after your last update."
\r
6441 #: ../source/TortoiseGit_en.xml:8549
\r
6443 msgid "Click <guibutton>Next</guibutton> and go to <xref linkend=\"tsvn-dug-merge-options\"/>"
\r
6446 #: ../source/TortoiseGit_en.xml:8559
\r
6448 msgid "reintegrate"
\r
6451 #: ../source/TortoiseGit_en.xml:8563
\r
6453 msgid "The Merge Wizard - Reintegrate Merge"
\r
6456 #: ../source/TortoiseGit_en.xml:8561
\r
6458 msgid "<placeholder-1/> To merge a feature branch back into the trunk you must start the merge wizard from within a working copy of the trunk."
\r
6461 #: ../source/TortoiseGit_en.xml:8569
\r
6463 msgid "In the <guilabel>From URL:</guilabel> field enter the full folder URL of the branch that you want to merge back. You may also click <guibutton>...</guibutton> to browse the repository."
\r
6466 #: ../source/TortoiseGit_en.xml:8576
\r
6468 msgid "There are some conditions which apply to a reintegrate merge. Firstly, the server must support merge tracking. The working copy must be of depth infinite (no sparse checkouts), and it must not have any local modifications, switched items or items that have been updated to revisions other than HEAD. All changes to trunk made during branch development must have been merged across to the branch (or marked as having been merged). The range of revisions to merge will be calculated automatically."
\r
6471 #: ../source/TortoiseGit_en.xml:8588
\r
6473 msgid "Merging Two Different Trees"
\r
6476 #: ../source/TortoiseGit_en.xml:8592
\r
6481 #: ../source/TortoiseGit_en.xml:8596
\r
6483 msgid "The Merge Wizard - Tree Merge"
\r
6486 #: ../source/TortoiseGit_en.xml:8594
\r
6488 msgid "<placeholder-1/> If you are using this method to merge a feature branch back to trunk, you need to start the merge wizard from within a working copy of trunk."
\r
6491 #: ../source/TortoiseGit_en.xml:8602
\r
6493 msgid "In the <guilabel>From:</guilabel> field enter the full folder URL of the <emphasis>trunk</emphasis>. This may sound wrong, but remember that the trunk is the start point to which you want to add the branch changes. You may also click <guibutton>...</guibutton> to browse the repository."
\r
6496 #: ../source/TortoiseGit_en.xml:8611
\r
6498 msgid "In the <guilabel>To:</guilabel> field enter the full folder URL of the feature branch."
\r
6501 #: ../source/TortoiseGit_en.xml:8615
\r
6503 msgid "In both the <guilabel>From Revision</guilabel> field and the <guilabel>To Revision</guilabel> field, enter the last revision number at which the two trees were synchronized. If you are sure no-one else is making commits you can use the HEAD revision in both cases. If there is a chance that someone else may have made a commit since that synchronization, use the specific revision number to avoid losing more recent commits."
\r
6506 #: ../source/TortoiseGit_en.xml:8625
\r
6508 msgid "You can also use <guibutton>Show Log</guibutton> to select the revision."
\r
6511 #: ../source/TortoiseGit_en.xml:8631
\r
6513 msgid "Merge Options"
\r
6516 #: ../source/TortoiseGit_en.xml:8633
\r
6518 msgid "This page of the wizard lets you specify advanced options, before starting the merge process. Most of the time you can just use the default settings."
\r
6521 #: ../source/TortoiseGit_en.xml:8638
\r
6523 msgid "You can specify the depth to use for the merge, i.e. how far down into your working copy the merge should go. The depth terms used are described in <xref linkend=\"tsvn-dug-checkout-depth\"/>. The default depth is <guilabel>Working copy</guilabel>, which uses the existing depth setting, and is almost always what you want."
\r
6526 #: ../source/TortoiseGit_en.xml:8645
\r
6528 msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the <guilabel>Ignore ancestry</guilabel> box. Read more about this topic in the Git book, <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html#svn.branchmerge.advanced.ancestry\"><citetitle>Noticing or Ignoring Ancestry</citetitle></ulink>"
\r
6531 #: ../source/TortoiseGit_en.xml:8662
\r
6533 msgid "You can specify the way that line ending and whitespace changes are handled. These options are described in <xref linkend=\"tsvn-dug-diff-eol-whitespace\"/>. The default behaviour is to treat all whitespace and line-end differences as real changes to be merged."
\r
6536 #: ../source/TortoiseGit_en.xml:8668
\r
6538 msgid "If you are using merge tracking and you want to mark a revision as having been merged, without actually doing the merge here, check the <guilabel>Only record the merge</guilabel> checkbox. There are two possible reasons you might want to do this. It may be that the merge is too complicated for the merge algorithms, so you code the changes by hand, then mark the change as merged so that the merge tracking algorithm is aware of it. Or you might want to prevent a particular revision from being merged. Marking it as already merged will prevent the merge occurring with merge-tracking-aware clients."
\r
6541 #: ../source/TortoiseGit_en.xml:8679
\r
6543 msgid "Now everything is set up, all you have to do is click on the <guibutton>Merge</guibutton> button. If you want to preview the results <guibutton>Test Merge</guibutton> performs the merge operation, but does <emphasis>not</emphasis> modify the working copy at all. It shows you a list of the files that will be changed by a real merge, and notes those areas where conflicts will occur."
\r
6546 #: ../source/TortoiseGit_en.xml:8687
\r
6548 msgid "The merge progress dialog shows each stage of the merge, with the revision ranges involved. This may indicate one more revision than you were expecting. For example if you asked to merge revision 123 the progress dialog will report <quote>Merging revisions 122 through 123</quote>. To understand this you need to remember that Merge is closely related to Diff. The merge process works by generating a list of differences between two points in the repository, and applying those differences to your working copy. The progress dialog is simply showing the start and end points for the diff."
\r
6551 #: ../source/TortoiseGit_en.xml:8700
\r
6553 msgid "Reviewing the Merge Results"
\r
6556 #: ../source/TortoiseGit_en.xml:8701
\r
6558 msgid "The merge is now complete. It's a good idea to have a look at the merge and see if it's as expected. Merging is usually quite complicated. Conflicts often arise if the branch has drifted far from the trunk."
\r
6561 #: ../source/TortoiseGit_en.xml:8706
\r
6563 msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should <emphasis>always</emphasis> include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.bestprac\"><citetitle>Best Practices for Merging</citetitle></ulink> in the Git book."
\r
6566 #: ../source/TortoiseGit_en.xml:8723
\r
6568 msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged."
\r
6571 #: ../source/TortoiseGit_en.xml:8730
\r
6573 msgid "Branch management is important. If you want to keep this branch up to date with the trunk, you should be sure to merge often so that the branch and trunk do not drift too far apart. Of course, you should still avoid repeated merging of changes, as explained above."
\r
6576 #: ../source/TortoiseGit_en.xml:8737
\r
6578 msgid "If you have just merged a feature branch back into the trunk, the trunk now contains all the new feature code, and the branch is obsolete. You can now delete it from the repository if required."
\r
6581 #: ../source/TortoiseGit_en.xml:8745
\r
6583 msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge."
\r
6586 #: ../source/TortoiseGit_en.xml:8755
\r
6588 msgid "Merge Tracking"
\r
6591 #: ../source/TortoiseGit_en.xml:8757
\r
6593 msgid "merge tracking"
\r
6596 #: ../source/TortoiseGit_en.xml:8765
\r
6598 msgid "You can avoid the danger of merging the same revision twice (repeated merge problem). Once a revision is marked as having been merged, future merges which include that revision in the range will skip over it."
\r
6601 #: ../source/TortoiseGit_en.xml:8773
\r
6603 msgid "When you merge a branch back into trunk, the log dialog can show you the branch commits as part of the trunk log, giving better traceability of changes."
\r
6606 #: ../source/TortoiseGit_en.xml:8780
\r
6608 msgid "When you show the log dialog from within the merge dialog, revisions already merged are shown in grey."
\r
6611 #: ../source/TortoiseGit_en.xml:8786
\r
6613 msgid "When showing blame information for a file, you can choose to show the original author of merged revisions, rather than the person who did the merge."
\r
6616 #: ../source/TortoiseGit_en.xml:8793
\r
6618 msgid "You can mark revisions as <emphasis>do not merge</emphasis> by including them in the list of merged revisions without actually doing the merge."
\r
6621 #: ../source/TortoiseGit_en.xml:8759
\r
6623 msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. <placeholder-1/>"
\r
6626 #: ../source/TortoiseGit_en.xml:8801
\r
6628 msgid "Merge tracking information is stored in the <literal>svn:mergeinfo</literal> property by the client when it performs a merge. When the merge is committed the server stores that information in a database, and when you request merge, log or blame information, the server can respond appropriately. For the system to work properly you must ensure that the server, the repository and all clients are upgraded. Earlier clients will not store the <literal>svn:mergeinfo</literal> property and earlier servers will not provide the information requested by new clients."
\r
6631 #: ../source/TortoiseGit_en.xml:8811
\r
6633 msgid "Find out more about merge tracking from Git's <ulink url=\"http://Git.tigris.org/merge-tracking/index.html\"><citetitle>Merge tracking documentation</citetitle></ulink>."
\r
6636 #: ../source/TortoiseGit_en.xml:8819
\r
6638 msgid "Handling Conflicts during Merge"
\r
6641 #: ../source/TortoiseGit_en.xml:8822
\r
6643 msgid "merge conflicts"
\r
6646 #: ../source/TortoiseGit_en.xml:8831
\r
6648 msgid "The Merge Conflict Callback Dialog"
\r
6651 #: ../source/TortoiseGit_en.xml:8824
\r
6653 msgid "Merging does not always go smoothly. Sometimes there is a conflict, and if you are merging multiple ranges, you generally want to resolve the conflict before merging of the next range starts. TortoiseGit helps you through this process by showing the <emphasis>merge conflict callback</emphasis> dialog. <placeholder-1/>"
\r
6656 #: ../source/TortoiseGit_en.xml:8840
\r
6658 msgid "You may decide that your local changes are much more important, so you want to discard the version from the repository and keep your local version. Or you might discard your local changes in favour of the repository version. Either way, no attempt is made to merge the changes - you choose one or the other."
\r
6661 #: ../source/TortoiseGit_en.xml:8850
\r
6663 msgid "Normally you will want to look at the conflicts and resolve them. In that case, choose the <guibutton>Edit Conflict</guibutton> which will start up your merge tool. When you are satisfied with the result, click <guibutton>Resolved</guibutton>."
\r
6666 #: ../source/TortoiseGit_en.xml:8858
\r
6668 msgid "The last option is to postpone resolution and continue with merging. You can choose to do that for the current conflicted file, or for all files in the rest of the merge. However, if there are further changes in that file, it will not be possible to complete the merge."
\r
6671 #: ../source/TortoiseGit_en.xml:8835
\r
6673 msgid "When a conflict occurs during the merge, you have three ways to handle it. <placeholder-1/>"
\r
6676 #: ../source/TortoiseGit_en.xml:8868
\r
6678 msgid "If you do not want to use this interactive callback, there is a checkbox in the merge progress dialog <guilabel>Merge non-interactive</guilabel>. If this is set for a merge and the merge would result in a conflict, the file is marked as in conflict and the merge goes on. You will have to resolve the conflicts after the whole merge is finished. If it is not set, then before a file is marked as conflicted you get the chance to resolve the conflict <emphasis>during</emphasis> the merge. This has the advantage that if a file gets multiple merges (multiple revisions apply a change to that file), subsequent merges might succeed depending on which lines are affected. But of course you can't walk away to get a coffee while the merge is running ;)"
\r
6681 #: ../source/TortoiseGit_en.xml:8883
\r
6683 msgid "Merge a Completed Branch"
\r
6686 #: ../source/TortoiseGit_en.xml:8886
\r
6688 msgid "merge reintegrate"
\r
6691 #: ../source/TortoiseGit_en.xml:8898
\r
6693 msgid "The Merge reintegrate Dialog"
\r
6696 #: ../source/TortoiseGit_en.xml:8888
\r
6698 msgid "If you want to merge all changes from a feature branch back to trunk, then you can use the <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Merge reintegrate...</guimenuitem></menuchoice> from the extended context menu (hold down the <keycap>Shift</keycap> key while you right click on the file). <placeholder-1/> This dialog is very easy. All you have to do is set the options for the merge, as described in <xref linkend=\"tsvn-dug-merge-options\"/>. The rest is done by TortoiseGit automatically using merge tracking."
\r
6701 #: ../source/TortoiseGit_en.xml:8907
\r
6703 msgid "Feature Branch Maintenance"
\r
6706 #: ../source/TortoiseGit_en.xml:8908
\r
6708 msgid "When you develop a new feature on a separate branch it is a good idea to work out a policy for re-integration when the feature is complete. If other work is going on in <literal>trunk</literal> at the same time you may find that the differences become significant over time, and merging back becomes a nightmare."
\r
6711 #: ../source/TortoiseGit_en.xml:8915
\r
6713 msgid "If the feature is relatively simple and development will not take long then you can adopt a simple approach, which is to keep the branch entirely separate until the feature is complete, then merge the branch changes back into trunk. In the merge wizard this would be a simple <guilabel>Merge a range of revisions</guilabel>, with the revision range being the revision span of the branch."
\r
6716 #: ../source/TortoiseGit_en.xml:8923
\r
6718 msgid "If the feature is going to take longer and you need to account for changes in <literal>trunk</literal>, then you need to keep the branch synchronised. This simply means that periodically you merge trunk changes into the branch, so that the branch contains all the trunk changes <emphasis>plus</emphasis> the new feature. The synchronisation process uses <guilabel>Merge a range of revisions</guilabel>. When the feature is complete then you can merge it back to <literal>trunk</literal> using either <guilabel>Reintegrate a branch</guilabel> or <guilabel>Merge two different trees</guilabel>."
\r
6721 #: ../source/TortoiseGit_en.xml:8938
\r
6726 #: ../source/TortoiseGit_en.xml:8940
\r
6731 #: ../source/TortoiseGit_en.xml:8943
\r
6736 #: ../source/TortoiseGit_en.xml:8953
\r
6738 msgid "You are using <quote>unmergeable</quote> files, for example, graphics files. If two people change the same file, merging is not possible, so one of you will lose their changes."
\r
6741 #: ../source/TortoiseGit_en.xml:8961
\r
6743 msgid "Your company has always used a locking revision control system in the past and there has been a management decision that <quote>locking is best</quote>."
\r
6746 #: ../source/TortoiseGit_en.xml:8945
\r
6748 msgid "Git generally works best without locking, using the <quote>Copy-Modify-Merge</quote> methods described earlier in <xref linkend=\"tsvn-basics-versioning-copymodifymerge\"/>. However there are a few instances when you may need to implement some form of locking policy. <placeholder-1/>"
\r
6751 #: ../source/TortoiseGit_en.xml:8969
\r
6753 msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using <literal>file://</literal> access, then of course only your client needs to be updated."
\r
6756 #: ../source/TortoiseGit_en.xml:8976
\r
6758 msgid "How Locking Works in Git"
\r
6761 #: ../source/TortoiseGit_en.xml:8977
\r
6763 msgid "By default, nothing is locked and anyone who has commit access can commit changes to any file at any time. Others will update their working copies periodically and changes in the repository will be merged with local changes."
\r
6766 #: ../source/TortoiseGit_en.xml:8983
\r
6768 msgid "If you <firstterm>Get a Lock</firstterm> on a file, then only you can commit that file. Commits by all other users will be blocked until you release the lock. A locked file cannot be modified in any way in the repository, so it cannot be deleted or renamed either, except by the lock owner."
\r
6771 #: ../source/TortoiseGit_en.xml:8990
\r
6773 msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property <literal>svn:needs-lock</literal>. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only <emphasis>unless</emphasis> that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing."
\r
6776 #: ../source/TortoiseGit_en.xml:9006
\r
6778 msgid "Locks are recorded by working copy location as well as by owner. If you have several working copies (at home, at work) then you can only hold a lock in <emphasis>one</emphasis> of those working copies."
\r
6781 #: ../source/TortoiseGit_en.xml:9012
\r
6783 msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as <firstterm>Breaking</firstterm> the lock, and forcibly acquiring a lock which someone else already holds is referred to as <firstterm>Stealing</firstterm> the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers."
\r
6786 #: ../source/TortoiseGit_en.xml:9022
\r
6788 msgid "Locks are recorded in the repository, and a lock token is created in your local working copy. If there is a discrepancy, for example if someone else has broken the lock, the local lock token becomes invalid. The repository is always the definitive reference."
\r
6791 #: ../source/TortoiseGit_en.xml:9031
\r
6793 msgid "Getting a Lock"
\r
6796 #: ../source/TortoiseGit_en.xml:9040
\r
6798 msgid "The Locking Dialog"
\r
6801 #: ../source/TortoiseGit_en.xml:9032
\r
6803 msgid "Select the file(s) in your working copy for which you want to acquire a lock, then select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Get Lock...</guimenuitem></menuchoice>. <placeholder-1/> A dialog appears, allowing you to enter a comment, so others can see why you have locked the file. The comment is optional and currently only used with Svnserve based repositories. If (and <emphasis>only</emphasis> if) you need to steal the lock from someone else, check the <guilabel>Steal lock</guilabel> box, then click on <guibutton>OK</guibutton>."
\r
6806 #: ../source/TortoiseGit_en.xml:9052
\r
6808 msgid "If you select a folder and then use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Get Lock...</guimenuitem></menuchoice> the lock dialog will open with <emphasis>every</emphasis> file in <emphasis>every</emphasis> sub-folder selected for locking. If you really want to lock an entire hierarchy, that is the way to do it, but you could become very unpopular with your co-workers if you lock them out of the whole project. Use with care ..."
\r
6811 #: ../source/TortoiseGit_en.xml:9066
\r
6813 msgid "Releasing a Lock"
\r
6816 #: ../source/TortoiseGit_en.xml:9067
\r
6818 msgid "To make sure you don't forget to release a lock you don't need any more, locked files are shown in the commit dialog and selected by default. If you continue with the commit, locks you hold on the selected files are removed, even if the files haven't been modified. If you don't want to release a lock on certain files, you can uncheck them (if they're not modified). If you want to keep a lock on a file you've modified, you have to enable the <guilabel>Keep locks</guilabel> checkbox before you commit your changes."
\r
6821 #: ../source/TortoiseGit_en.xml:9078
\r
6823 msgid "To release a lock manually, select the file(s) in your working copy for which you want to release the lock, then select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Release Lock</guimenuitem></menuchoice> There is nothing further to enter so TortoiseGit will contact the repository and release the locks. You can also use this command on a folder to release all locks recursively."
\r
6826 #: ../source/TortoiseGit_en.xml:9091
\r
6828 msgid "Checking Lock Status"
\r
6831 #: ../source/TortoiseGit_en.xml:9094
\r
6833 msgid "The Check for Modifications Dialog"
\r
6836 #: ../source/TortoiseGit_en.xml:9092
\r
6838 msgid "<placeholder-1/> To see what locks you and others hold, you can use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Check for Modifications...</guimenuitem></menuchoice>. Locally held lock tokens show up immediately. To check for locks held by others (and to see if any of your locks are broken or stolen) you need to click on <guibutton>Check Repository</guibutton>."
\r
6841 #: ../source/TortoiseGit_en.xml:9107
\r
6843 msgid "From the context menu here, you can also get and release locks, as well as breaking and stealing locks held by others."
\r
6846 #: ../source/TortoiseGit_en.xml:9112
\r
6848 msgid "Avoid Breaking and Stealing Locks"
\r
6851 #: ../source/TortoiseGit_en.xml:9113
\r
6853 msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you."
\r
6856 #: ../source/TortoiseGit_en.xml:9125
\r
6858 msgid "Making Non-locked Files Read-Only"
\r
6861 #: ../source/TortoiseGit_en.xml:9126
\r
6863 msgid "As mentioned above, the most effective way to use locking is to set the <literal>svn:needs-lock</literal> property on files. Refer to <xref linkend=\"tsvn-dug-propertypage\"/> for instructions on how to set properties. Files with this property set will always be checked out and updated with the read-only flag set unless your working copy holds a lock. <graphic fileref=\"../images/ReadOnlyIcon.png\"/> As a reminder, TortoiseGit uses a special overlay to indicate this."
\r
6866 #: ../source/TortoiseGit_en.xml:9136
\r
6868 msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read <xref linkend=\"tsvn-dug-propertypage-auto-props\"/> for further information."
\r
6871 #: ../source/TortoiseGit_en.xml:9145
\r
6873 msgid "The Locking Hook Scripts"
\r
6876 #: ../source/TortoiseGit_en.xml:9146
\r
6878 msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository <filename>hooks</filename> directory. These are called before and after getting a lock, and before and after releasing a lock."
\r
6881 #: ../source/TortoiseGit_en.xml:9152
\r
6883 msgid "It is a good idea to install a <literal>post-lock</literal> and <literal>post-unlock</literal> hook script on the server which sends out an email indicating the file which has been locked. With such a script in place, all your users can be notified if someone locks/unlocks a file. You can find an example hook script <filename>hooks/post-lock.tmpl</filename> in your repository folder."
\r
6886 #: ../source/TortoiseGit_en.xml:9160
\r
6888 msgid "You might also use hooks to disallow breaking or stealing of locks, or perhaps limit it to a named administrator. Or maybe you want to email the owner when one of their locks is broken or stolen."
\r
6891 #: ../source/TortoiseGit_en.xml:9166
\r
6893 msgid "Read <xref linkend=\"tsvn-repository-hooks\"/> to find out more."
\r
6896 #: ../source/TortoiseGit_en.xml:9172
\r
6898 msgid "Creating and Applying Patches"
\r
6901 #: ../source/TortoiseGit_en.xml:9174
\r
6906 #: ../source/TortoiseGit_en.xml:9180
\r
6908 msgid "unified diff"
\r
6911 #: ../source/TortoiseGit_en.xml:9184
\r
6913 msgid "For open source projects (like this one) everyone has read access to the repository, and anyone can make a contribution to the project. So how are those contributions controlled? If just anyone could commit changes, the project would be permanently unstable and probably permanently broken. In this situation the change is managed by submitting a <firstterm>patch</firstterm> file to the development team, who do have write access. They can review the patch first, and then either submit it to the repository or reject it back to the author."
\r
6916 #: ../source/TortoiseGit_en.xml:9195
\r
6918 msgid "Patch files are simply Unified-Diff files showing the differences between your working copy and the base revision."
\r
6921 #: ../source/TortoiseGit_en.xml:9200
\r
6923 msgid "Creating a Patch File"
\r
6926 #: ../source/TortoiseGit_en.xml:9201
\r
6928 msgid "First you need to make <emphasis>and test</emphasis> your changes. Then instead of using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Commit...</guimenuitem></menuchoice> on the parent folder, you select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Create Patch...</guimenuitem></menuchoice>"
\r
6931 #: ../source/TortoiseGit_en.xml:9215
\r
6933 msgid "The Create Patch dialog"
\r
6936 #: ../source/TortoiseGit_en.xml:9218
\r
6938 msgid "you can now select the files you want included in the patch, just as you would with a full commit. This will produce a single file containing a summary of all the changes you have made to the selected files since the last update from the repository."
\r
6941 #: ../source/TortoiseGit_en.xml:9229
\r
6943 msgid "You can produce separate patches containing changes to different sets of files. Of course, if you create a patch file, make some more changes to the <emphasis>same</emphasis> files and then create another patch, the second patch file will include <emphasis>both</emphasis> sets of changes."
\r
6946 #: ../source/TortoiseGit_en.xml:9235
\r
6948 msgid "Just save the file using a filename of your choice. Patch files can have any extension you like, but by convention they should use the <filename>.patch</filename> or <filename>.diff</filename> extension. You are now ready to submit your patch file."
\r
6951 #: ../source/TortoiseGit_en.xml:9242
\r
6953 msgid "You can also save the patch to the clipboard instead of to a file. You might want to do this so that you can paste it into an email for review by others. Or if you have two working copies on one machine and you want to transfer changes from one to the other, a patch on the clipboard is a convenient way of doing this."
\r
6956 #: ../source/TortoiseGit_en.xml:9251
\r
6958 msgid "Applying a Patch File"
\r
6961 #: ../source/TortoiseGit_en.xml:9252
\r
6963 msgid "Patch files are applied to your working copy. This should be done from the same folder level as was used to create the patch. If you are not sure what this is, just look at the first line of the patch file. For example, if the first file being worked on was <filename>doc/source/english/chapter1.xml</filename> and the first line in the patch file is <filename>Index: english/chapter1.xml</filename> then you need to apply the patch to the <filename>doc/source/</filename> folder. However, provided you are in the correct working copy, if you pick the wrong folder level, TortoiseGit will notice and suggest the correct level."
\r
6966 #: ../source/TortoiseGit_en.xml:9266
\r
6968 msgid "In order to apply a patch file to your working copy, you need to have at least read access to the repository. The reason for this is that the merge program must reference the changes back to the revision against which they were made by the remote developer."
\r
6971 #: ../source/TortoiseGit_en.xml:9273
\r
6973 msgid "From the context menu for that folder, click on <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Apply Patch...</guimenuitem></menuchoice> This will bring up a file open dialog allowing you to select the patch file to apply. By default only <filename>.patch</filename> or <filename>.diff</filename> files are shown, but you can opt for <quote>All files</quote>. If you previously saved a patch to the clipboard, you can use <guibutton>Open from clipboard...</guibutton> in the file open dialog."
\r
6976 #: ../source/TortoiseGit_en.xml:9287
\r
6978 msgid "Alternatively, if the patch file has a <filename>.patch</filename> or <filename>.diff</filename> extension, you can right click on it directly and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Apply Patch...</guimenuitem></menuchoice>. In this case you will be prompted to enter a working copy location."
\r
6981 #: ../source/TortoiseGit_en.xml:9297
\r
6983 msgid "These two methods just offer different ways of doing the same thing. With the first method you select the WC and browse to the patch file. With the second you select the patch file and browse to the WC."
\r
6986 #: ../source/TortoiseGit_en.xml:9302
\r
6988 msgid "Once you have selected the patch file and working copy location, TortoiseMerge runs to merge the changes from the patch file with your working copy. A small window lists the files which have been changed. Double click on each one in turn, review the changes and save the merged files."
\r
6991 #: ../source/TortoiseGit_en.xml:9309
\r
6993 msgid "The remote developer's patch has now been applied to your working copy, so you need to commit to allow everyone else to access the changes from the repository."
\r
6996 #: ../source/TortoiseGit_en.xml:9317
\r
6998 msgid "Who Changed Which Line?"
\r
7001 #: ../source/TortoiseGit_en.xml:9319
\r
7006 #: ../source/TortoiseGit_en.xml:9322
\r
7011 #: ../source/TortoiseGit_en.xml:9325
\r
7016 #: ../source/TortoiseGit_en.xml:9328
\r
7018 msgid "Sometimes you need to know not only what lines have changed, but also who exactly changed specific lines in a file. That's when the <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Blame...</guimenuitem></menuchoice> command, sometimes also referred to as <firstterm>annotate</firstterm> command comes in handy."
\r
7021 #: ../source/TortoiseGit_en.xml:9338
\r
7023 msgid "This command lists, for every line in a file, the author and the revision the line was changed."
\r
7026 #: ../source/TortoiseGit_en.xml:9343
\r
7028 msgid "Blame for Files"
\r
7031 #: ../source/TortoiseGit_en.xml:9346
\r
7033 msgid "The Annotate / Blame Dialog"
\r
7036 #: ../source/TortoiseGit_en.xml:9344
\r
7038 msgid "<placeholder-1/> If you're not interested in changes from earlier revisions you can set the revision from which the blame should start. Set this to <literal>1</literal>, if you want the blame for <emphasis>every</emphasis> revision."
\r
7041 #: ../source/TortoiseGit_en.xml:9353
\r
7043 msgid "By default the blame file is viewed using <firstterm>TortoiseBlame</firstterm>, which highlights the different revisions to make it easier to read. If you wish to print or edit the blame file, select <guilabel>Use Text viewer to view blames</guilabel>"
\r
7046 #: ../source/TortoiseGit_en.xml:9359
\r
7048 msgid "You can specify the way that line ending and whitespace changes are handled. These options are described in <xref linkend=\"tsvn-dug-diff-eol-whitespace\"/>. The default behaviour is to treat all whitespace and line-end differences as real changes, but if you want to ignore an indentation change and find the original author, you can choose an appropriate option here."
\r
7051 #: ../source/TortoiseGit_en.xml:9366
\r
7053 msgid "Once you press <guibutton>OK</guibutton> TortoiseGit starts retrieving the data to create the blame file. Please note: This can take several minutes to finish, depending on how much the file has changed and of course your network connection to the repository. Once the blame process has finished the result is written into a temporary file and you can view the results."
\r
7056 #: ../source/TortoiseGit_en.xml:9376
\r
7058 msgid "TortoiseBlame"
\r
7061 #: ../source/TortoiseGit_en.xml:9374
\r
7063 msgid "<placeholder-1/> TortoiseBlame, which is included with TortoiseGit, makes the blame file easier to read. When you hover the mouse over a line in the blame info column, all lines with the same revision are shown with a darker background. Lines from other revisions which were changed by the same author are shown with a light background. The colouring may not work as clearly if you have your display set to 256 colour mode."
\r
7066 #: ../source/TortoiseGit_en.xml:9387
\r
7068 msgid "If you <action>left click</action> on a line, all lines with the same revision are highlighted, and lines from other revisions by the same author are highlighted in a lighter colour. This highlighting is sticky, allowing you to move the mouse without losing the highlights. Click on that revision again to turn off highlighting."
\r
7071 #: ../source/TortoiseGit_en.xml:9394
\r
7073 msgid "The revision comments (log message) are shown in a hint box whenever the mouse hovers over the blame info column. If you want to copy the log message for that revision, use the context menu which appears when you right click on the blame info column."
\r
7076 #: ../source/TortoiseGit_en.xml:9400
\r
7078 msgid "You can search within the Blame report using <menuchoice><guimenu>Edit</guimenu><guimenuitem>Find...</guimenuitem></menuchoice>. This allows you to search for revision numbers, authors and the content of the file itself. Log messages are not included in the search - you should use the Log Dialog to search those."
\r
7081 #: ../source/TortoiseGit_en.xml:9410
\r
7083 msgid "You can also jump to a specific line number using <menuchoice><guimenu>Edit</guimenu><guimenuitem>Go To Line...</guimenuitem></menuchoice>."
\r
7086 #: ../source/TortoiseGit_en.xml:9417
\r
7088 msgid "When the mouse is over the blame info columns, a context menu is available which helps with comparing revisions and examining history, using the revision number of the line under the mouse as a reference. <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Blame previous revision</guimenuitem></menuchoice> generates a blame report for the same file, but using the previous revision as the upper limit. This gives you the blame report for the state of the file just before the line you are looking at was last changed. <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Show changes</guimenuitem></menuchoice> starts your diff viewer, showing you what changed in the referenced revision. <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Show log</guimenuitem></menuchoice> displays the revision log dialog starting with the referenced revision."
\r
7091 #: ../source/TortoiseGit_en.xml:9439
\r
7093 msgid "If you need a better visual indicator of where the oldest and newest changes are, select <menuchoice><guimenu>View</guimenu><guimenuitem>Color age of lines</guimenuitem></menuchoice>. This will use a colour gradient to show newer lines in red and older lines in blue. The default colouring is quite light, but you can change it using the TortoiseBlame settings."
\r
7096 #: ../source/TortoiseGit_en.xml:9450
\r
7098 msgid "If you are using Merge Tracking, where lines have changed as a result of merging from another path, TortoiseBlame will show the revision and author of the last change in the original file rather than the revision where the merge took place. These lines are indicated by showing the revision and author in italics. If you do not want merged lines shown in this way, uncheck the <guilabel>Include merge info</guilabel> checkbox."
\r
7101 #: ../source/TortoiseGit_en.xml:9459
\r
7103 msgid "If you want to see the paths involved in the merge, select <menuchoice><guimenu>View</guimenu><guimenuitem>Merge paths</guimenuitem></menuchoice>."
\r
7106 #: ../source/TortoiseGit_en.xml:9466
\r
7108 msgid "The settings for TortoiseBlame can be accessed using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Settings...</guimenuitem></menuchoice> on the TortoiseBlame tab. Refer to <xref linkend=\"tsvn-dug-settings-tortoiseblame\"/>."
\r
7111 #: ../source/TortoiseGit_en.xml:9477
\r
7113 msgid "Blame Differences"
\r
7116 #: ../source/TortoiseGit_en.xml:9478
\r
7118 msgid "One of the limitations of the Blame report is that it only shows the file as it was in a particular revision, and shows the last person to change each line. Sometimes you want to know what change was made, as well as who made it. What you need here is a combination of the diff and blame reports."
\r
7121 #: ../source/TortoiseGit_en.xml:9488
\r
7123 msgid "Blame Revisions"
\r
7126 #: ../source/TortoiseGit_en.xml:9490
\r
7128 msgid "In the top pane, select 2 revisions, then select <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Blame revisions</guimenuitem></menuchoice>. This will fetch the blame data for the 2 revisions, then use the diff viewer to compare the two blame files."
\r
7131 #: ../source/TortoiseGit_en.xml:9502
\r
7133 msgid "Blame Changes"
\r
7136 #: ../source/TortoiseGit_en.xml:9504
\r
7138 msgid "Select one revision in the top pane, then pick one file in the bottom pane and select <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Blame changes</guimenuitem></menuchoice>. This will fetch the blame data for the selected revision and the previous revision, then use the diff viewer to compare the two blame files."
\r
7141 #: ../source/TortoiseGit_en.xml:9518
\r
7143 msgid "Compare and Blame with Working BASE"
\r
7146 #: ../source/TortoiseGit_en.xml:9520
\r
7148 msgid "Show the log for a single file, and in the top pane, select a single revision, then select <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Compare and Blame with Working BASE</guimenuitem></menuchoice>. This will fetch the blame data for the selected revision, and for the file in the working BASE, then use the diff viewer to compare the two blame files."
\r
7151 #: ../source/TortoiseGit_en.xml:9484
\r
7153 msgid "The revision log dialog includes several options which allow you to do this. <placeholder-1/>"
\r
7156 #: ../source/TortoiseGit_en.xml:9538
\r
7158 #: ../source/TortoiseGit_en.xml:9562
\r
7160 msgid "The Repository Browser"
\r
7163 #: ../source/TortoiseGit_en.xml:9540
\r
7165 msgid "repo-browser"
\r
7168 #: ../source/TortoiseGit_en.xml:9543
\r
7170 msgid "server-side actions"
\r
7173 #: ../source/TortoiseGit_en.xml:9552
\r
7175 msgid "server viewer"
\r
7178 #: ../source/TortoiseGit_en.xml:9555
\r
7180 msgid "Sometimes you need to work directly on the repository, without having a working copy. That's what the <firstterm>Repository Browser</firstterm> is for. Just as the explorer and the icon overlays allow you to view your working copy, so the Repository Browser allows you to view the structure and status of the repository. <placeholder-1/> With the Repository Browser you can execute commands like copy, move, rename, ... directly on the repository."
\r
7183 #: ../source/TortoiseGit_en.xml:9568
\r
7185 msgid "The repository browser looks very similar to the Windows explorer, except that it is showing the content of the repository at a particular revision rather than files on your computer. In the left pane you can see a directory tree, and in the right pane are the contents of the selected directory. At the top of the Repository Browser Window you can enter the URL of the repository and the revision you want to browse."
\r
7188 #: ../source/TortoiseGit_en.xml:9577
\r
7190 msgid "Just like Windows explorer, you can click on the column headings in the right pane if you want to set the sort order. And as in explorer there are context menus available in both panes."
\r
7193 #: ../source/TortoiseGit_en.xml:9592
\r
7195 msgid "Save an unversioned copy of the file to your hard drive."
\r
7198 #: ../source/TortoiseGit_en.xml:9597
\r
7200 msgid "Show the revision log for that file, or show a graph of all revisions so you can see where the file came from."
\r
7203 #: ../source/TortoiseGit_en.xml:9603
\r
7205 msgid "Blame the file, to see who changed which line and when."
\r
7208 #: ../source/TortoiseGit_en.xml:9608
\r
7210 msgid "Delete or rename the file."
\r
7213 #: ../source/TortoiseGit_en.xml:9613
\r
7215 msgid "Make a copy of the file, either to a different part of the repository, or to a working copy rooted in the same repository."
\r
7218 #: ../source/TortoiseGit_en.xml:9619
\r
7220 msgid "View/Edit the file's properties."
\r
7223 #: ../source/TortoiseGit_en.xml:9582
\r
7225 msgid "The context menu for a file allows you to: <placeholder-1/>"
\r
7228 #: ../source/TortoiseGit_en.xml:9629
\r
7230 msgid "Show the revision log for that folder, or show a graph of all revisions so you can see where the folder came from."
\r
7233 #: ../source/TortoiseGit_en.xml:9635
\r
7235 msgid "Export the folder to a local unversioned copy on your hard drive."
\r
7238 #: ../source/TortoiseGit_en.xml:9640
\r
7240 msgid "Checkout the folder to produce a local working copy on your hard drive."
\r
7243 #: ../source/TortoiseGit_en.xml:9645
\r
7245 msgid "Create a new folder in the repository."
\r
7248 #: ../source/TortoiseGit_en.xml:9650
\r
7250 msgid "Add files or folders directly to the repository."
\r
7253 #: ../source/TortoiseGit_en.xml:9655
\r
7255 msgid "Delete or rename the folder."
\r
7258 #: ../source/TortoiseGit_en.xml:9660
\r
7260 msgid "Make a copy of the folder, either to a different part of the repository, or to a working copy rooted in the same repository."
\r
7263 #: ../source/TortoiseGit_en.xml:9666
\r
7265 msgid "View/Edit the folder's properties."
\r
7268 #: ../source/TortoiseGit_en.xml:9671
\r
7270 msgid "Mark the folder for comparison. A marked folder is shown in bold."
\r
7273 #: ../source/TortoiseGit_en.xml:9676
\r
7275 msgid "Compare the folder with a previously marked folder, either as a unified diff, or as a list of changed files which can then be visually diffed using the default diff tool. This can be particularly useful for comparing two tags, or trunk and branch to see what changed."
\r
7278 #: ../source/TortoiseGit_en.xml:9625
\r
7280 msgid "The context menu for a folder allows you to: <placeholder-1/>"
\r
7283 #: ../source/TortoiseGit_en.xml:9685
\r
7285 msgid "If you select two folders in the right pane, you can view the differences either as a unified-diff, or as a list of files which can be visually diffed using the default diff tool."
\r
7288 #: ../source/TortoiseGit_en.xml:9690
\r
7290 msgid "If you select multiple folders in the right pane, you can checkout all of them at once into a common parent folder."
\r
7293 #: ../source/TortoiseGit_en.xml:9694
\r
7295 msgid "If you select 2 tags which are copied from the same root (typically <literal>/trunk/</literal>), you can use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Show Log...</guimenuitem></menuchoice> to view the list of revisions between the two tag points."
\r
7298 #: ../source/TortoiseGit_en.xml:9703
\r
7300 msgid "You can use <keycap>F5</keycap> to refresh the view as usual. This will refresh everything which is currently displayed. If you want to pre-fetch or refresh the information for nodes which have not been opened yet, use <keycap>Ctrl-F5</keycap>. After that, expanding any node will happen instantly without a network delay while the information is fetched."
\r
7303 #: ../source/TortoiseGit_en.xml:9710
\r
7305 msgid "You can also use the repository browser for drag-and-drop operations. If you drag a folder from explorer into the repo-browser, it will be imported into the repository. Note that if you drag multiple items, they will be imported in separate commits."
\r
7308 #: ../source/TortoiseGit_en.xml:9716
\r
7310 msgid "If you want to move an item within the repository, just <action>left drag</action> it to the new location. If you want to create a copy rather than moving the item, <keycap>Ctrl</keycap>-<action>left drag</action> instead. When copying, the cursor has a <quote>plus</quote> symbol on it, just as it does in Explorer."
\r
7313 #: ../source/TortoiseGit_en.xml:9722
\r
7315 msgid "If you want to copy/move a file or folder to another location and also give it a new name at the same time, you can <action>right drag</action> or <keycap>Ctrl</keycap>-<action>right drag</action> the item instead of using <action>left drag</action>. In that case, a rename dialog is shown where you can enter a new name for the file or folder."
\r
7318 #: ../source/TortoiseGit_en.xml:9729
\r
7320 msgid "Whenever you make changes in the repository using one of these methods, you will be presented with a log message entry dialog. If you dragged something by mistake, this is also your chance to cancel the action."
\r
7323 #: ../source/TortoiseGit_en.xml:9734
\r
7325 msgid "Sometimes when you try to open a path you will get an error message in place of the item details. This might happen if you specified an invalid URL, or if you don't have access permission, or if there is some other server problem. If you need to copy this message to include it in an email, just right click on it and use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Copy error message to clipboard</guimenuitem></menuchoice>, or simply use <keycap>Ctrl+C</keycap>."
\r
7328 #: ../source/TortoiseGit_en.xml:9749
\r
7330 msgid "Revision Graphs"
\r
7333 #: ../source/TortoiseGit_en.xml:9754
\r
7338 #: ../source/TortoiseGit_en.xml:9757
\r
7340 msgid "revision graph"
\r
7343 #: ../source/TortoiseGit_en.xml:9761
\r
7345 msgid "A Revision Graph"
\r
7348 #: ../source/TortoiseGit_en.xml:9759
\r
7350 msgid "<placeholder-1/> Sometimes you need to know where branches and tags were taken from the trunk, and the ideal way to view this sort of information is as a graph or tree structure. That's when you need to use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revision Graph...</guimenuitem></menuchoice>"
\r
7353 #: ../source/TortoiseGit_en.xml:9772
\r
7355 msgid "This command analyses the revision history and attempts to create a tree showing the points at which copies were taken, and when branches/tags were deleted."
\r
7358 #: ../source/TortoiseGit_en.xml:9778
\r
7360 msgid "In order to generate the graph, TortoiseGit must fetch all log messages from the repository root. Needless to say this can take several minutes even with a repository of a few thousand revisions, depending on server speed, network bandwidth, etc. If you try this with something like the <emphasis>Apache</emphasis> project which currently has over 500,000 revisions you could be waiting for some time."
\r
7363 #: ../source/TortoiseGit_en.xml:9786
\r
7365 msgid "The good news is that if you are using Log Caching, you only have to suffer this delay once. After that, log data is held locally. Log caching is enabled in TortoiseGit's settings."
\r
7368 #: ../source/TortoiseGit_en.xml:9793
\r
7370 msgid "Revision Graph Nodes"
\r
7373 #: ../source/TortoiseGit_en.xml:9805
\r
7375 msgid "Added or copied items"
\r
7378 #: ../source/TortoiseGit_en.xml:9807
\r
7380 msgid "Items which have been added, or created by copying another file/folder are shown using a rounded rectangle. The default colour is green. Tags are treated as a special case and use a different shade."
\r
7383 #: ../source/TortoiseGit_en.xml:9816
\r
7385 msgid "Deleted items"
\r
7388 #: ../source/TortoiseGit_en.xml:9818
\r
7390 msgid "Deleted items eg. a branch which is no longer required, are shown using an octagon (rectangle with corners cut off). The default colour is red."
\r
7393 #: ../source/TortoiseGit_en.xml:9826
\r
7395 msgid "Renamed items"
\r
7398 #: ../source/TortoiseGit_en.xml:9828
\r
7400 msgid "Renamed items are also shown using an octagon, but the default colour is blue."
\r
7403 #: ../source/TortoiseGit_en.xml:9835
\r
7405 msgid "Replaced items"
\r
7408 #: ../source/TortoiseGit_en.xml:9837
\r
7410 msgid "A replaced item is one where the original item has been deleted and replaced with another item of the same name. The default colour is green."
\r
7413 #: ../source/TortoiseGit_en.xml:9845
\r
7415 msgid "Branch tip revision"
\r
7418 #: ../source/TortoiseGit_en.xml:9847
\r
7420 msgid "Where a branch (or trunk or tag) has been modified since the last branch node, this is shown using an ellipse. Shown when the <guilabel>Show HEAD revisions</guilabel> option is selected."
\r
7423 #: ../source/TortoiseGit_en.xml:9856
\r
7425 msgid "Normal item"
\r
7428 #: ../source/TortoiseGit_en.xml:9858
\r
7430 msgid "All other items are shown using a plain rectangle."
\r
7433 #: ../source/TortoiseGit_en.xml:9794
\r
7435 msgid "Each revision graph node represents a revision in the repository where something changed in the tree you are looking at. Different types of node can be distinguished by shape and colour. The shapes are fixed, but colours can be set using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Settings</guimenuitem></menuchoice><placeholder-1/>"
\r
7438 #: ../source/TortoiseGit_en.xml:9865
\r
7440 msgid "Note that by default the graph only shows the points at which items were added, copied or deleted. Showing every revision of a project where simple modifications too place will generate a very large graph for non-trivial cases. If you really want to see <emphasis>all</emphasis> revisions where changes were made, there is an option to do this in the <guilabel>View</guilabel> menu and on the toolbar."
\r
7443 #: ../source/TortoiseGit_en.xml:9876
\r
7445 msgid "Changing the View"
\r
7448 #: ../source/TortoiseGit_en.xml:9884
\r
7450 msgid "Group branches"
\r
7453 #: ../source/TortoiseGit_en.xml:9886
\r
7455 msgid "The default behavior (grouping off) will use one row per revision and all rows are sorted strictly by revision. As a result, long-living branches occupy a whole column for only a few changes and the graph becomes very broad."
\r
7458 #: ../source/TortoiseGit_en.xml:9892
\r
7460 msgid "This mode groups changes by branch, so that there is no global revision ordering: Consecutive revisions on a branch will be shown in (often) consecutive lines. Sub-branches, however, are arranged in such a way that later branches will be shown in the same column above older branches to keep the graph slim. As a result, a given row may contain changes from different revisions."
\r
7463 #: ../source/TortoiseGit_en.xml:9904
\r
7465 msgid "Oldest on top"
\r
7468 #: ../source/TortoiseGit_en.xml:9906
\r
7470 msgid "Normally the graph shows the oldest revision at the bottom, and the tree grows upwards. Use this option to grow down from the top instead."
\r
7473 #: ../source/TortoiseGit_en.xml:9914
\r
7475 msgid "Align trees on top"
\r
7478 #: ../source/TortoiseGit_en.xml:9916
\r
7480 msgid "When a graph is broken into several smaller trees, the trees may appear either in natural revision order, or aligned at the bottom of the window, depending on whether you are using the <guilabel>Group Branches</guilabel> option. Use this option to grow all trees down from the top instead."
\r
7483 #: ../source/TortoiseGit_en.xml:9927
\r
7485 msgid "Reduce cross lines"
\r
7488 #: ../source/TortoiseGit_en.xml:9929
\r
7490 msgid "If the layout of the graph has produced a lot of crossing lines, use this option to clean it up. This may make the layout columns appear in less logical places, for example in a diagonal line rather than a column, and it may take a little time to optimise."
\r
7493 #: ../source/TortoiseGit_en.xml:9940
\r
7495 msgid "Differential path names"
\r
7498 #: ../source/TortoiseGit_en.xml:9942
\r
7500 msgid "Long path names can take a lot of space and make the node boxes very large. Use this option to show only the changed part of a path, replacing the common part with dots. e.g. if you create a branch <literal>/branches/1.2.x/doc/html</literal> from <literal>/trunk/doc/html</literal> the branch could be shown in compact form as <literal>/branches/1.2.x/.</literal>"
\r
7503 #: ../source/TortoiseGit_en.xml:9955
\r
7505 msgid "Show all revisions"
\r
7508 #: ../source/TortoiseGit_en.xml:9957
\r
7510 msgid "This does just what you expect and shows every revision where something (in the tree that you are graphing) has changed. For long histories this can produce a truly huge graph."
\r
7513 #: ../source/TortoiseGit_en.xml:9966
\r
7515 msgid "Show HEAD revisions"
\r
7518 #: ../source/TortoiseGit_en.xml:9968
\r
7520 msgid "This ensures that the latest revision on every branch is always shown on the graph."
\r
7523 #: ../source/TortoiseGit_en.xml:9975
\r
7525 msgid "Exact copy sources"
\r
7528 #: ../source/TortoiseGit_en.xml:9977
\r
7530 msgid "When a branch/tag is made, the default behaviour is to show the branch as taken from the last node where a change was made. Strictly speaking this is inaccurate since the branches are often made from the current HEAD rather than a specific revision. So it is possible to show the more correct (but less useful) revision that was used to create the copy."
\r
7533 #: ../source/TortoiseGit_en.xml:9989
\r
7538 #: ../source/TortoiseGit_en.xml:9991
\r
7540 msgid "If you want to see a graph of software development, tagged releases may be of little interest to you. This option hides the nodes for tags and shows them instead in the tooltip for the node that they were copied from. A tag icon on the right side of the source node indicates that tags were made."
\r
7543 #: ../source/TortoiseGit_en.xml:10002
\r
7545 msgid "Hide deleted paths"
\r
7548 #: ../source/TortoiseGit_en.xml:10004
\r
7550 msgid "Hides paths which are no longer present at the HEAD revision of the repository, e.g. deleted branches."
\r
7553 #: ../source/TortoiseGit_en.xml:10011
\r
7555 msgid "Hide unused branches"
\r
7558 #: ../source/TortoiseGit_en.xml:10013
\r
7560 msgid "Hides branches where no changes were committed that affect the tree being graphed before the branch was deleted. This does not necessarily indicate that the branch was not used, just that no changes were made to <emphasis>this</emphasis> part of it."
\r
7563 #: ../source/TortoiseGit_en.xml:10023
\r
7565 msgid "Show WC revision"
\r
7568 #: ../source/TortoiseGit_en.xml:10025
\r
7570 msgid "Marks the revision on the graph which corresponds to the update revision of the item you fetched the graph for. If you have just updated, this will be HEAD, but if others have committed changes since your last update your WC may be a few revisions lower down. The node is marked by giving it a bold outline."
\r
7573 #: ../source/TortoiseGit_en.xml:10036
\r
7575 msgid "Show WC modifications"
\r
7578 #: ../source/TortoiseGit_en.xml:10038
\r
7580 msgid "If your WC contains local changes, this option draws it as a separate elliptical node, linked back to the node that your WC was last updated to. The default outline colour is red. You may need to refresh the graph using <keycap>F5</keycap> to capture recent changes."
\r
7583 #: ../source/TortoiseGit_en.xml:10049
\r
7588 #: ../source/TortoiseGit_en.xml:10051
\r
7590 msgid "Sometimes the revision graph contains more revisions than you want to see. This option opens a dialog which allows you to restrict the range of revisions displayed, and to hide particular paths by name."
\r
7593 #: ../source/TortoiseGit_en.xml:10060
\r
7595 msgid "Tree stripes"
\r
7598 #: ../source/TortoiseGit_en.xml:10062
\r
7600 msgid "Where the graph contains several trees, it is sometimes useful to use alternating colours on the background to help distinguish between trees,"
\r
7603 #: ../source/TortoiseGit_en.xml:10070
\r
7605 msgid "Show overview"
\r
7608 #: ../source/TortoiseGit_en.xml:10072
\r
7610 msgid "Shows a small picture of the entire graph, with the current view window as a rectangle which you can drag. This allows you to navigate the graph more easily."
\r
7613 #: ../source/TortoiseGit_en.xml:9877
\r
7615 msgid "Because a revision graph is often quite complex, there are a number of features which can be used to tailor the view the way you want it. These are available in the <guilabel>View</guilabel> menu and from the toolbar. <placeholder-1/>"
\r
7618 #: ../source/TortoiseGit_en.xml:10083
\r
7620 msgid "Using the Graph"
\r
7623 #: ../source/TortoiseGit_en.xml:10084
\r
7625 msgid "To make it easier to navigate a large graph, use the overview window. This shows the entire graph in a small window, with the currently displayed portion highlighted. You can drag the highlighted area to change the displayed region."
\r
7628 #: ../source/TortoiseGit_en.xml:10090
\r
7630 msgid "The revision date, author and comments are shown in a hint box whenever the mouse hovers over a revision box."
\r
7633 #: ../source/TortoiseGit_en.xml:10094
\r
7635 msgid "If you select two revisions (Use <keycap>Ctrl</keycap>-<action>left click</action>), you can use the context menu to show the differences between these revisions. You can choose to show differences as at the branch creation points, but usually you will want to show the differences at the branch end points, i.e. at the HEAD revision."
\r
7638 #: ../source/TortoiseGit_en.xml:10101
\r
7640 msgid "You can view the differences as a Unified-Diff file, which shows all differences in a single file with minimal context. If you opt to <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Compare Revisions</guimenuitem></menuchoice> you will be presented with a list of changed files. <action>Double click</action> on a file name to fetch both revisions of the file and compare them using the visual difference tool."
\r
7643 #: ../source/TortoiseGit_en.xml:10112
\r
7645 msgid "If you <action>right click</action> on a revision you can use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Show Log</guimenuitem></menuchoice> to view the history."
\r
7648 #: ../source/TortoiseGit_en.xml:10120
\r
7650 msgid "You can also merge changes in the selected revision(s) into a different working copy. A folder selection dialog allows you to choose the working copy to merge into, but after that there is no confirmation dialog, nor any opportunity to try a test merge. It is a good idea to merge into an unmodified working copy so that you can revert the changes if it doesn't work out! This is a useful feature if you want to merge selected revisions from one branch to another."
\r
7653 #: ../source/TortoiseGit_en.xml:10131
\r
7655 msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results."
\r
7658 #: ../source/TortoiseGit_en.xml:10141
\r
7660 msgid "If you want to check the server again for newer information, you can simply refresh the view using <keycap>F5</keycap>. If you are using the log cache (enabled by default), this will check the repository for newer commits and fetch only the new ones. If the log cache was in offline mode, this will also attempt to go back online."
\r
7663 #: ../source/TortoiseGit_en.xml:10149
\r
7665 msgid "If you are using the log cache and you think the message content or author may have changed, you should use the log dialog to refresh the messages you need. Since the revision graph works from the repository root, we would have to invalidate the entire log cache, and refilling it could take a <emphasis>very</emphasis> long time."
\r
7668 #: ../source/TortoiseGit_en.xml:10159
\r
7670 msgid "Pruning Trees"
\r
7673 #: ../source/TortoiseGit_en.xml:10160
\r
7675 msgid "A large tree can be difficult to navigate and sometimes you will want to hide parts of it, or break it down into a forest of smaller trees. If you hover the mouse over the point where a node link enters or leaves the node you will see one or more popup buttons which allow you to do this."
\r
7678 #: ../source/TortoiseGit_en.xml:10167
\r
7680 msgid "<graphic fileref=\"../images/RevGraphCollapse.png\"/> Click on the minus button to collapse the attached sub-tree."
\r
7683 #: ../source/TortoiseGit_en.xml:10171
\r
7685 msgid "<graphic fileref=\"../images/RevGraphExpand.png\"/> Click on the plus button to expand a collapsed tree. When a tree has been collapsed, this button remains visible to indicate the hidden sub-tree."
\r
7688 #: ../source/TortoiseGit_en.xml:10177
\r
7690 msgid "<graphic fileref=\"../images/RevGraphSplit.png\"/> Click on the cross button to split the attached sub-tree and show it as a separate tree on the graph."
\r
7693 #: ../source/TortoiseGit_en.xml:10182
\r
7695 msgid "<graphic fileref=\"../images/RevGraphJoin.png\"/> Click on the circle button to reattach a split tree. When a tree has been split away, this button remains visible to indicate that there is a separate sub-tree."
\r
7698 #: ../source/TortoiseGit_en.xml:10191
\r
7700 msgid "Exporting a Git Working Copy"
\r
7703 #: ../source/TortoiseGit_en.xml:10193
\r
7708 #: ../source/TortoiseGit_en.xml:10196
\r
7710 msgid "unversioned 'working copy'"
\r
7713 #: ../source/TortoiseGit_en.xml:10198
\r
7715 msgid "Sometimes you may want a copy of your working tree without any of those <filename>.svn</filename> directories, e.g. to create a zipped tarball of your source, or to export to a web server. Instead of making a copy and then deleting all those <filename>.svn</filename> directories manually, TortoiseGit offers the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Export...</guimenuitem></menuchoice>. Exporting from a URL and exporting from a working copy are treated slightly differently."
\r
7718 #: ../source/TortoiseGit_en.xml:10213
\r
7720 msgid "The Export-from-URL Dialog"
\r
7723 #: ../source/TortoiseGit_en.xml:10211
\r
7725 msgid "<placeholder-1/> If you execute this command on an unversioned folder, TortoiseGit will assume that the selected folder is the target, and open a dialog for you to enter the URL and revision to export from. This dialog has options to export only the top level folder, to omit external references, and to override the line end style for files which have the <literal>svn:eol-style</literal> property set."
\r
7728 #: ../source/TortoiseGit_en.xml:10223
\r
7730 msgid "Of course you can export directly from the repository too. Use the Repository Browser to navigate to the relevant subtree in your repository, then use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Export</guimenuitem></menuchoice>. You will get the <guilabel>Export from URL</guilabel> dialog described above."
\r
7733 #: ../source/TortoiseGit_en.xml:10233
\r
7735 msgid "If you execute this command on your working copy you'll be asked for a place to save the <emphasis>clean</emphasis> working copy without the <filename>.svn</filename> folders. By default, only the versioned files are exported, but you can use the <guilabel>Export unversioned files too</guilabel> checkbox to include any other unversioned files which exist in your WC and not in the repository. External references using <literal>svn:externals</literal> can be omitted if required."
\r
7738 #: ../source/TortoiseGit_en.xml:10243
\r
7740 msgid "Another way to export from a working copy is to <action>right drag</action> the working copy folder to another location and choose <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Export here</guimenuitem></menuchoice> or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Export all here</guimenuitem></menuchoice>. The second option includes the unversioned files as well."
\r
7743 #: ../source/TortoiseGit_en.xml:10257
\r
7745 msgid "When exporting from a working copy, if the target folder already contains a folder of the same name as the one you are exporting, you will be given the option to overwrite the existing content, or to create a new folder with an automatically generated name, eg. <literal>Target (1)</literal>."
\r
7748 #: ../source/TortoiseGit_en.xml:10265
\r
7750 msgid "Exporting single files"
\r
7753 #: ../source/TortoiseGit_en.xml:10266
\r
7755 msgid "The export dialog does not allow exporting single files, even though Git can."
\r
7758 #: ../source/TortoiseGit_en.xml:10270
\r
7760 msgid "To export single files with TortoiseGit, you have to use the repository browser (<xref linkend=\"tsvn-dug-repobrowser\"/>). Simply drag the file(s) you want to export from the repository browser to where you want them in the explorer, or use the context menu in the repository browser to export the files."
\r
7763 #: ../source/TortoiseGit_en.xml:10279
\r
7765 msgid "Exporting a Change Tree"
\r
7768 #: ../source/TortoiseGit_en.xml:10280
\r
7770 msgid "If you want to export a copy of your project tree structure but containing only the files which have changed in a particular revision, or between any two revisions, use the compare revisions feature described in <xref linkend=\"tsvn-dug-compare-revs\"/>."
\r
7773 #: ../source/TortoiseGit_en.xml:10288
\r
7775 msgid "Removing a working copy from version control"
\r
7778 #: ../source/TortoiseGit_en.xml:10290
\r
7780 #: ../source/TortoiseGit_en.xml:14149
\r
7785 #: ../source/TortoiseGit_en.xml:10292
\r
7787 msgid "Sometimes you have a working copy which you want to convert back to a normal folder without the <literal>.svn</literal> directories. What you really need is an export-in-place command, that just removes the control directories rather than generating a new clean directory tree."
\r
7790 #: ../source/TortoiseGit_en.xml:10299
\r
7792 msgid "The answer is surprisingly simple - export the folder to itself! TortoiseGit detects this special case and asks if you want to make the working copy unversioned. If you answer <emphasis>yes</emphasis> the control directories will be removed and you will have a plain, unversioned directory tree."
\r
7795 #: ../source/TortoiseGit_en.xml:10309
\r
7797 msgid "Relocating a working copy"
\r
7800 #: ../source/TortoiseGit_en.xml:10311
\r
7805 #: ../source/TortoiseGit_en.xml:10314
\r
7807 msgid "URL changed"
\r
7810 #: ../source/TortoiseGit_en.xml:10317
\r
7812 msgid "repository URL changed"
\r
7815 #: ../source/TortoiseGit_en.xml:10320
\r
7817 msgid "server moved"
\r
7820 #: ../source/TortoiseGit_en.xml:10323
\r
7822 msgid "moved server"
\r
7825 #: ../source/TortoiseGit_en.xml:10328
\r
7827 msgid "The Relocate Dialog"
\r
7830 #: ../source/TortoiseGit_en.xml:10326
\r
7832 msgid "<placeholder-1/> If your repository has for some reason changed it's location (IP/URL). Maybe you're even stuck and can't commit and you don't want to checkout your working copy again from the new location and to move all your changed data back into the new working copy, <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Relocate</guimenuitem></menuchoice> is the command you are looking for. It basically does very little: it scans all <filename>entries</filename> files in the <filename>.svn</filename> folder and changes the URL of the entries to the new value."
\r
7835 #: ../source/TortoiseGit_en.xml:10345
\r
7837 msgid "You may be surprised to find that TortoiseGit contacts the repository as part of this operation. All it is doing is performing some simple checks to make sure that the new URL really does refer to the same repository as the existing working copy."
\r
7840 #: ../source/TortoiseGit_en.xml:10358
\r
7842 msgid "The IP address of the server has changed."
\r
7845 #: ../source/TortoiseGit_en.xml:10361
\r
7847 msgid "The protocol has changed (e.g. http:// to https://)."
\r
7850 #: ../source/TortoiseGit_en.xml:10364
\r
7852 msgid "The repository root path in the server setup has changed."
\r
7855 #: ../source/TortoiseGit_en.xml:10352
\r
7857 msgid "<emphasis>This is a very infrequently used operation</emphasis>. The relocate command is <emphasis>only</emphasis> used if the URL of the repository root has changed. Possible reasons are: <placeholder-1/> Put another way, you need to relocate when your working copy is referring to the same location in the same repository, but the repository itself has moved."
\r
7860 #: ../source/TortoiseGit_en.xml:10375
\r
7862 msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location."
\r
7865 #: ../source/TortoiseGit_en.xml:10381
\r
7867 msgid "You want to switch to a different branch or directory within the same repository. To do that you should use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Switch...</guimenuitem></menuchoice>. Read <xref linkend=\"tsvn-dug-switch-1\"/> for more information."
\r
7870 #: ../source/TortoiseGit_en.xml:10371
\r
7872 msgid "It does not apply if: <placeholder-1/>"
\r
7875 #: ../source/TortoiseGit_en.xml:10393
\r
7877 msgid "If you use relocate in either of the cases above, it <emphasis>will corrupt your working copy</emphasis> and you will get many unexplainable error messages while updating, committing, etc. Once that has happened, the only fix is a fresh checkout."
\r
7880 #: ../source/TortoiseGit_en.xml:10402
\r
7882 msgid "Integration with Bug Tracking Systems / Issue Trackers"
\r
7885 #: ../source/TortoiseGit_en.xml:10404
\r
7887 msgid "bug tracking"
\r
7890 #: ../source/TortoiseGit_en.xml:10407
\r
7892 msgid "bug tracker"
\r
7895 #: ../source/TortoiseGit_en.xml:10410
\r
7897 msgid "issue tracker"
\r
7900 #: ../source/TortoiseGit_en.xml:10413
\r
7902 msgid "bugtracker"
\r
7905 #: ../source/TortoiseGit_en.xml:10415
\r
7907 msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly."
\r
7910 #: ../source/TortoiseGit_en.xml:10428
\r
7912 msgid "When the user enters a log message, a well defined line including the issue number associated with the commit can be added automatically. This reduces the risk that the user enters the issue number in a way the bug tracking tools can't parse correctly."
\r
7915 #: ../source/TortoiseGit_en.xml:10434
\r
7917 msgid "Or TortoiseGit can highlight the part of the entered log message which is recognized by the issue tracker. That way the user knows that the log message can be parsed correctly."
\r
7920 #: ../source/TortoiseGit_en.xml:10441
\r
7922 msgid "When the user browses the log messages, TortoiseGit creates a link out of each bug ID in the log message which fires up the browser to the issue mentioned."
\r
7925 #: ../source/TortoiseGit_en.xml:10424
\r
7927 msgid "TortoiseGit can help the user in two ways: <placeholder-1/>"
\r
7930 #: ../source/TortoiseGit_en.xml:10450
\r
7932 msgid "Adding Issue Numbers to Log Messages"
\r
7935 #: ../source/TortoiseGit_en.xml:10451
\r
7937 msgid "You can integrate a bug tracking tool of your choice in TortoiseGit. To do this, you have to define some properties, which start with <literal>bugtraq:</literal>. They must be set on Folders: (<xref linkend=\"tsvn-dug-propertypage\"/>)"
\r
7940 #: ../source/TortoiseGit_en.xml:10466
\r
7942 msgid "Set this property to the URL of your bug tracking tool. It must be properly URI encoded and it has to contain <literal>%BUGID%</literal>. <literal>%BUGID%</literal> is replaced with the Issue number you entered. This allows TortoiseGit to display a link in the log dialog, so when you are looking at the revision log you can jump directly to your bug tracking tool. You do not have to provide this property, but then TortoiseGit shows only the issue number and not the link to it. e.g the TortoiseGit project is using <systemitem class=\"url\">http://issues.TortoiseGit.net/?do=details&id=%BUGID%</systemitem>"
\r
7945 #: ../source/TortoiseGit_en.xml:10481
\r
7947 msgid "You can also use relative URLs instead of absolute ones. This is useful when your issue tracker is on the same domain/server as your source repository. In case the domain name ever changes, you don't have to adjust the <literal>bugtraq:url</literal> property. There are two ways to specify a relative URL:"
\r
7950 #: ../source/TortoiseGit_en.xml:10488
\r
7952 msgid "If it begins with the string <literal>^/</literal> it is assumed to be relative to the repository root. For example, <literal>^/../?do=details&id=%BUGID%</literal> will resolve to <systemitem class=\"url\">http://TortoiseGit.net/?do=details&id=%BUGID%</systemitem> if your repository is located on <systemitem class=\"url\">http://TortoiseGit.net/svn/trunk/</systemitem>."
\r
7955 #: ../source/TortoiseGit_en.xml:10497
\r
7957 msgid "A URL beginning with the string <literal>/</literal> is assumed to be relative to the server's hostname. For example <literal>/?do=details&id=%BUGID%</literal> will resolve to <systemitem class=\"url\">http://TortoiseGit.net/?do=details&id=%BUGID%</systemitem> if your repository is located anywhere on <systemitem class=\"url\">http://TortoiseGit.net</systemitem>."
\r
7960 #: ../source/TortoiseGit_en.xml:10511
\r
7962 msgid "Set this to <literal>true</literal>, if you want TortoiseGit to warn you because of an empty issue-number text field. Valid values are <literal>true/false</literal>. <emphasis> If not defined, <literal>false</literal> is assumed. </emphasis>"
\r
7965 #: ../source/TortoiseGit_en.xml:10457
\r
7967 msgid "There are two ways to integrate TortoiseGit with issue trackers. One is based on simple strings, the other is based on <emphasis>regular expressions</emphasis>. The properties used by both approaches are: <placeholder-1/>"
\r
7970 #: ../source/TortoiseGit_en.xml:10525
\r
7972 msgid "Issue Number in Text Box"
\r
7975 #: ../source/TortoiseGit_en.xml:10534
\r
7977 msgid "This property activates the bug tracking system in <emphasis>Input field</emphasis> mode. If this property is set, then TortoiseGit will prompt you to enter an issue number when you commit your changes. It's used to add a line at the end of the log message. It must contain <literal>%BUGID%</literal>, which is replaced with the issue number on commit. This ensures that your commit log contains a reference to the issue number which is always in a consistent format and can be parsed by your bug tracking tool to associate the issue number with a particular commit. As an example you might use <literal>Issue : %BUGID%</literal>, but this depends on your Tool."
\r
7980 #: ../source/TortoiseGit_en.xml:10555
\r
7982 msgid "This property defines if the bug-ID is appended (true) to the end of the log message or inserted (false) at the start of the log message. Valid values are <literal>true/false</literal>. <emphasis> If not defined, <literal>true</literal> is assumed, so that existing projects don't break. </emphasis>"
\r
7985 #: ../source/TortoiseGit_en.xml:10570
\r
7987 msgid "This text is shown by TortoiseGit on the commit dialog to label the edit box where you enter the issue number. If it's not set, <literal>Bug-ID / Issue-Nr:</literal> will be displayed. Keep in mind though that the window will not be resized to fit this label, so keep the size of the label below 20-25 characters."
\r
7990 #: ../source/TortoiseGit_en.xml:10584
\r
7992 msgid "If set to <literal>true</literal> only numbers are allowed in the issue-number text field. An exception is the comma, so you can comma separate several numbers. Valid values are <literal>true/false</literal>. <emphasis> If not defined, <literal>true</literal> is assumed. </emphasis>"
\r
7995 #: ../source/TortoiseGit_en.xml:10526
\r
7997 msgid "In the simple approach, TortoiseGit shows the user a separate input field where a bug ID can be entered. Then a separate line is appended/prepended to the log message the user entered. <placeholder-1/>"
\r
8000 #: ../source/TortoiseGit_en.xml:10599
\r
8002 msgid "Issue Numbers Using Regular Expressions"
\r
8005 #: ../source/TortoiseGit_en.xml:10611
\r
8007 msgid "This property activates the bug tracking system in <emphasis>Regex</emphasis> mode. It contains either a single regular expressions, or two regular expressions separated by a newline."
\r
8010 #: ../source/TortoiseGit_en.xml:10617
\r
8012 msgid "If two expressions are set, then the first expression is used as a pre-filter to find expressions which contain bug IDs. The second expression then extracts the bare bug IDs from the result of the first regex. This allows you to use a list of bug IDs and natural language expressions if you wish. e.g. you might fix several bugs and include a string something like this: <quote>This change resolves issues #23, #24 and #25</quote>"
\r
8015 #: ../source/TortoiseGit_en.xml:10627
\r
8017 msgid "If you want to catch bug IDs as used in the expression above inside a log message, you could use the following regex strings, which are the ones used by the TortoiseGit project: <literal>[Ii]ssues?:?(\\s*(,|and)?\\s*#\\d+)+</literal> and <literal>(\\d+)</literal>"
\r
8020 #: ../source/TortoiseGit_en.xml:10634
\r
8022 msgid "The first expression picks out <quote>issues #23, #24 and #25</quote> from the surrounding log message. The second regex extracts plain decimal numbers from the output of the first regex, so it will return <quote>23</quote>, <quote>24</quote> and <quote>25</quote> to use as bug IDs."
\r
8025 #: ../source/TortoiseGit_en.xml:10641
\r
8027 msgid "Breaking the first regex down a little, it must start with the word <quote>issue</quote>, possibly capitalised. This is optionally followed by an <quote>s</quote> (more than one issue) and optionally a colon. This is followed by one or more groups each having zero or more leading whitespace, an optional comma or <quote>and</quote> and more optional space. Finally there is a mandatory <quote>#</quote> and a mandatory decimal number."
\r
8030 #: ../source/TortoiseGit_en.xml:10650
\r
8032 msgid "If only one expression is set, then the bare bug IDs must be matched in the groups of the regex string. Example: <literal>[Ii]ssue(?:s)? #?(\\d+)</literal> This method is required by a few issue trackers, e.g. trac, but it is harder to construct the regex. We recommend that you only use this method if your issue tracker documentation tells you to."
\r
8035 #: ../source/TortoiseGit_en.xml:10659
\r
8037 msgid "If you are unfamiliar with regular expressions, take a look at the introduction at <ulink url=\"http://en.wikipedia.org/wiki/Regular_expression\"><citetitle>http://en.wikipedia.org/wiki/Regular_expression</citetitle></ulink>, and the online documentation and tutorial at <ulink url=\"http://www.regular-expressions.info/\"><citetitle>http://www.regular-expressions.info/</citetitle></ulink>."
\r
8040 #: ../source/TortoiseGit_en.xml:10600
\r
8042 msgid "In the approach with <emphasis>regular expressions</emphasis>, TortoiseGit doesn't show a separate input field but marks the part of the log message the user enters which is recognized by the issue tracker. This is done while the user writes the log message. This also means that the bug ID can be anywhere inside a log message! This method is much more flexible, and is the one used by the TortoiseGit project itself. <placeholder-1/>"
\r
8045 #: ../source/TortoiseGit_en.xml:10675
\r
8047 msgid "If both the <literal>bugtraq:message</literal> and <literal>bugtraq:logregex</literal> properties are set, <literal>logregex</literal> takes precedence."
\r
8050 #: ../source/TortoiseGit_en.xml:10680
\r
8052 msgid "Even if you don't have an issue tracker with a pre-commit hook parsing your log messages, you still can use this to turn the issues mentioned in your log messages into links!"
\r
8055 #: ../source/TortoiseGit_en.xml:10685
\r
8057 msgid "And even if you don't need the links, the issue numbers show up as a separate column in the log dialog, making it easier to find the changes which relate to a particular issue."
\r
8060 #: ../source/TortoiseGit_en.xml:10698
\r
8062 #: ../source/TortoiseGit_en.xml:10871
\r
8064 msgid "Set the Properties on Folders"
\r
8067 #: ../source/TortoiseGit_en.xml:10699
\r
8069 #: ../source/TortoiseGit_en.xml:10872
\r
8071 msgid "These properties must be set on folders for the system to work. When you commit a file or folder the properties are read from that folder. If the properties are not found there, TortoiseGit will search upwards through the folder tree to find them until it comes to an unversioned folder, or the tree root (eg. <literal>C:\\</literal>) is found. If you can be sure that each user checks out only from e.g <filename>trunk/</filename> and not some sub-folder, then it's enough if you set the properties on <filename>trunk/</filename>. If you can't be sure, you should set the properties recursively on each sub-folder. A property setting deeper in the project hierarchy overrides settings on higher levels (closer to <filename>trunk/</filename>)."
\r
8074 #: ../source/TortoiseGit_en.xml:10713
\r
8076 #: ../source/TortoiseGit_en.xml:10886
\r
8078 msgid "For <literal>tsvn:</literal> properties <emphasis>only</emphasis> you can use the <guilabel>Recursive</guilabel> checkbox to set the property to all sub-folders in the hierarchy, without also setting it on all files."
\r
8081 #: ../source/TortoiseGit_en.xml:10721
\r
8083 msgid "No Issue Tracker Information from Repository Browser"
\r
8086 #: ../source/TortoiseGit_en.xml:10722
\r
8088 msgid "Because the issue tracker integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser."
\r
8091 #: ../source/TortoiseGit_en.xml:10729
\r
8093 msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/doc/issuetrackers.txt\"><citetitle>Issue Tracker Integration Specification</citetitle></ulink> in the TortoiseGit source repository. (<xref linkend=\"tsvn-preface-source\"/> explains how to access the repository)."
\r
8096 #: ../source/TortoiseGit_en.xml:10740
\r
8098 msgid "Getting Information from the Issue Tracker"
\r
8101 #: ../source/TortoiseGit_en.xml:10741
\r
8103 msgid "The previous section deals with adding issue information to the log messages. But what if you need to get information from the issue tracker? The commit dialog has a Windows COM interface which allows integration an external program that can talk to your tracker. Typically you might want to query the tracker to get a list of open issues assigned to you, so that you can pick the issues that are being addressed in this commit."
\r
8106 #: ../source/TortoiseGit_en.xml:10750
\r
8108 msgid "Any such interface is of course highly specific to your system, so we cannot provide this part, and describing how to create such a program is beyond the scope of this manual. The interface definition and sample programs can be obtained from the <literal>contrib</literal> folder in the <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/issue-tracker-plugins\"><citetitle>TortoiseGit repository</citetitle></ulink>. (<xref linkend=\"tsvn-preface-source\"/> explains how to access the repository)."
\r
8111 #: ../source/TortoiseGit_en.xml:10769
\r
8113 msgid "Example issue tracker query dialog"
\r
8116 #: ../source/TortoiseGit_en.xml:10761
\r
8118 msgid "For illustration purposes, let's suppose that your system administrator has provided you with an issue tracker plugin which you have installed, and that you have set up some of your working copies to use the plugin in TortoiseGit's settings dialog. When you open the commit dialog from a working copy to which the plugin has been assigned, you will see a new button at the top of the dialog. <placeholder-1/> In this example you can select one or more open issues. The plugin can then generate specially formatted text which it adds to your log message."
\r
8121 #: ../source/TortoiseGit_en.xml:10776
\r
8123 msgid "If you work with the Google Code repository, you can use the ready-made <ulink url=\"http://code.google.com/p/gurtle/\"><citetitle>Gurtle</citetitle></ulink> plugin."
\r
8126 #: ../source/TortoiseGit_en.xml:10786
\r
8128 msgid "Integration with Web-based Repository Viewers"
\r
8131 #: ../source/TortoiseGit_en.xml:10788
\r
8136 #: ../source/TortoiseGit_en.xml:10791
\r
8138 msgid "repo viewer"
\r
8141 #: ../source/TortoiseGit_en.xml:10794
\r
8146 #: ../source/TortoiseGit_en.xml:10797
\r
8151 #: ../source/TortoiseGit_en.xml:10799
\r
8153 msgid "There are several web-based repository viewers available for use with Git such as <ulink url=\"http://www.viewvc.org/\"><citetitle>ViewVC</citetitle></ulink> and <ulink url=\"http://websvn.tigris.org/\"><citetitle>WebSVN</citetitle></ulink>. TortoiseGit provides a means to link with these viewers."
\r
8156 #: ../source/TortoiseGit_en.xml:10811
\r
8158 msgid "You can integrate a repo viewer of your choice in TortoiseGit. To do this, you have to define some properties which define the linkage. They must be set on Folders: (<xref linkend=\"tsvn-dug-propertypage\"/>)"
\r
8161 #: ../source/TortoiseGit_en.xml:10821
\r
8163 msgid "Set this property to the URL of your repo viewer to view all changes in a specific revision. It must be properly URI encoded and it has to contain <literal>%REVISION%</literal>. <literal>%REVISION%</literal> is replaced with the revision number in question. This allows TortoiseGit to display a context menu entry in the log dialog <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>View revision in webviewer</guimenuitem></menuchoice>"
\r
8166 #: ../source/TortoiseGit_en.xml:10840
\r
8168 msgid "Set this property to the URL of your repo viewer to view changes to a specific file in a specific revision. It must be properly URI encoded and it has to contain <literal>%REVISION%</literal> and <literal>%PATH%</literal>. <literal>%PATH%</literal> is replaced with the path relative to the repository root. This allows TortoiseGit to display a context menu entry in the log dialog <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>View revision and path in webviewer</guimenuitem></menuchoice> For example, if you right-click in the log dialog bottom pane on a file entry <literal>/trunk/src/file</literal> then the <literal>%PATH%</literal> in the URL will be replaced with <literal>/trunk/src/file</literal>."
\r
8171 #: ../source/TortoiseGit_en.xml:10862
\r
8173 msgid "You can also use relative URLs instead of absolute ones. This is useful in case your web viewer is on the same domain/server as your source repository. In case the domain name ever changes, you don't have to adjust the <literal>webviewer:revision</literal> and <literal>webviewer:pathrevision</literal> property. The format is the same as for the <literal>bugtraq:url</literal> property. See <xref linkend=\"tsvn-dug-bugtracker\"/>."
\r
8176 #: ../source/TortoiseGit_en.xml:10894
\r
8178 msgid "No Repo Viewer Links from Repository Browser"
\r
8181 #: ../source/TortoiseGit_en.xml:10895
\r
8183 msgid "Because the repo viewer integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser."
\r
8186 #: ../source/TortoiseGit_en.xml:10904
\r
8188 msgid "TortoiseGit's Settings"
\r
8191 #: ../source/TortoiseGit_en.xml:10906
\r
8196 #: ../source/TortoiseGit_en.xml:10908
\r
8198 msgid "To find out what the different settings are for, just leave your mouse pointer a second on the editbox/checkbox... and a helpful tooltip will popup."
\r
8201 #: ../source/TortoiseGit_en.xml:10917
\r
8203 msgid "General Settings"
\r
8206 #: ../source/TortoiseGit_en.xml:10919
\r
8211 #: ../source/TortoiseGit_en.xml:10923
\r
8213 msgid "The Settings Dialog, General Page"
\r
8216 #: ../source/TortoiseGit_en.xml:10921
\r
8218 msgid "<placeholder-1/> This dialog allows you to specify your preferred language, and the Git-specific settings."
\r
8221 #: ../source/TortoiseGit_en.xml:10931
\r
8226 #: ../source/TortoiseGit_en.xml:10933
\r
8228 msgid "Selects your user interface language. What else did you expect?"
\r
8231 #: ../source/TortoiseGit_en.xml:10940
\r
8233 msgid "Automatically check for newer versions every week"
\r
8236 #: ../source/TortoiseGit_en.xml:10942
\r
8238 msgid "If checked, TortoiseGit will contact its download site once a week to see if there is a newer version of the program available. Use <guibutton>Check now</guibutton> if you want an answer right away. The new version will not be downloaded; you simply receive an information dialog telling you that the new version is available."
\r
8241 #: ../source/TortoiseGit_en.xml:10953
\r
8243 msgid "System sounds"
\r
8246 #: ../source/TortoiseGit_en.xml:10959
\r
8251 #: ../source/TortoiseGit_en.xml:10964
\r
8256 #: ../source/TortoiseGit_en.xml:10969
\r
8261 #: ../source/TortoiseGit_en.xml:10955
\r
8263 msgid "TortoiseGit has three custom sounds which are installed by default. <placeholder-1/> You can select different sounds (or turn these sounds off completely) using the Windows Control Panel. <guibutton>Configure</guibutton> is a shortcut to the Control Panel."
\r
8266 #: ../source/TortoiseGit_en.xml:10981
\r
8268 msgid "Global ignore pattern"
\r
8271 #: ../source/TortoiseGit_en.xml:10984
\r
8273 msgid "exclude pattern"
\r
8276 #: ../source/TortoiseGit_en.xml:10987
\r
8278 msgid "global ignore"
\r
8281 #: ../source/TortoiseGit_en.xml:10989
\r
8283 msgid "Global ignore patterns are used to prevent unversioned files from showing up e.g. in the commit dialog. Files matching the patterns are also ignored by an import. Ignore files or directories by typing in the names or extensions. Patterns are separated by spaces e.g. <literal>bin obj *.bak *.~?? *.jar *.[Tt]mp</literal>. These patterns should not include any path separators. Note also that there is no way to differentiate between files and directories. Read <xref linkend=\"tsvn-dug-ignore-glob\"/> for more information on the pattern-matching syntax."
\r
8286 #: ../source/TortoiseGit_en.xml:11001
\r
8288 msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client."
\r
8291 #: ../source/TortoiseGit_en.xml:11007
\r
8293 msgid "If you use the Git configuration file to set a <literal>global-ignores</literal> pattern, it will override the settings you make here. The Git configuration file is accessed using the <guibutton>Edit</guibutton> as described below."
\r
8296 #: ../source/TortoiseGit_en.xml:11015
\r
8298 msgid "This ignore pattern will affect all your projects. It is not versioned, so it will not affect other users. By contrast you can also use the versioned <literal>svn:ignore</literal> property to exclude files or directories from version control. Read <xref linkend=\"tsvn-dug-ignore\"/> for more information."
\r
8301 #: ../source/TortoiseGit_en.xml:11027
\r
8303 msgid "Set file dates to the <quote>last commit time</quote>"
\r
8306 #: ../source/TortoiseGit_en.xml:11029
\r
8308 msgid "This option tells TortoiseGit to set the file dates to the last commit time when doing a checkout or an update. Otherwise TortoiseGit will use the current date. If you are developing software it is generally best to use the current date because build systems normally look at the date stamps to decide which files need compiling. If you use <quote>last commit time</quote> and revert to an older file revision, your project may not compile as you expect it to."
\r
8311 #: ../source/TortoiseGit_en.xml:11043
\r
8313 msgid "Git configuration file"
\r
8316 #: ../source/TortoiseGit_en.xml:11045
\r
8318 msgid "Use <guibutton>Edit</guibutton> to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git <filename>config</filename> file see the <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.advanced.confarea.html\"><citetitle>Runtime Configuration Area</citetitle></ulink>. The section on <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.advanced.props.html#svn.advanced.props.auto\"><citetitle>Automatic Property Setting</citetitle></ulink> is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.advanced.confarea.html#svn.advanced.confarea.windows-registry\"><citetitle>Configuration and the Windows Registry</citetitle></ulink> to find out more."
\r
8321 #: ../source/TortoiseGit_en.xml:11070
\r
8323 msgid "Use <filename>_svn</filename> instead of <filename>.svn</filename> directories"
\r
8326 #: ../source/TortoiseGit_en.xml:11072
\r
8328 msgid "VS.NET when used with web projects can't handle the <literal>.svn</literal> folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read <xref linkend=\"tsvn-dug-settings-asp-dot-net\"/> to find out more about this issue."
\r
8331 #: ../source/TortoiseGit_en.xml:11079
\r
8333 msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this."
\r
8336 #: ../source/TortoiseGit_en.xml:11084
\r
8338 msgid "You should note that changing this option will not automatically convert existing working copies to use the new admin directory. You will have to do that yourself using a script (See our FAQ) or simply check out a fresh working copy."
\r
8341 #: ../source/TortoiseGit_en.xml:11094
\r
8343 msgid "Context Menu Settings"
\r
8346 #: ../source/TortoiseGit_en.xml:11098
\r
8348 msgid "The Settings Dialog, Context Menu Page"
\r
8351 #: ../source/TortoiseGit_en.xml:11096
\r
8353 msgid "<placeholder-1/> This page allows you to specify which of the TortoiseGit context menu entries will show up in the main context menu, and which will appear in the TortoiseGit submenu. By default most items are unchecked and appear in the submenu."
\r
8356 #: ../source/TortoiseGit_en.xml:11106
\r
8358 msgid "There is a special case for <guilabel>Get Lock</guilabel>. You can of course promote it to the top level using the list above, but as most files don't need locking this just adds clutter. However, a file with the <literal>svn:needs-lock</literal> property needs this action every time it is edited, so in that case it is very useful to have at the top level. Checking the box here means that when a file is selected which has the <literal>svn:needs-lock</literal> property set, <guilabel>Get Lock</guilabel> will always appear at the top level."
\r
8361 #: ../source/TortoiseGit_en.xml:11116
\r
8363 msgid "If there are some paths on your computer where you just don't want TortoiseGit's context menu to appear at all, you can list them in the box at the bottom."
\r
8366 #: ../source/TortoiseGit_en.xml:11123
\r
8368 msgid "TortoiseGit Dialog Settings 1"
\r
8371 #: ../source/TortoiseGit_en.xml:11127
\r
8373 msgid "The Settings Dialog, Dialogs 1 Page"
\r
8376 #: ../source/TortoiseGit_en.xml:11125
\r
8378 msgid "<placeholder-1/> This dialog allows you to configure some of TortoiseGit's dialogs the way you like them."
\r
8381 #: ../source/TortoiseGit_en.xml:11135
\r
8383 msgid "Default number of log messages"
\r
8386 #: ../source/TortoiseGit_en.xml:11137
\r
8388 msgid "Limits the number of log messages that TortoiseGit fetches when you first select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Show Log</guimenuitem></menuchoice> Useful for slow server connections. You can always use <guibutton>Show All</guibutton> or <guibutton>Next 100</guibutton> to get more messages."
\r
8391 #: ../source/TortoiseGit_en.xml:11151
\r
8393 msgid "Font for log messages"
\r
8396 #: ../source/TortoiseGit_en.xml:11153
\r
8398 msgid "Selects the font face and size used to display the log message itself in the middle pane of the Revision Log dialog, and when composing log messages in the Commit dialog."
\r
8401 #: ../source/TortoiseGit_en.xml:11162
\r
8403 msgid "Short date / time format in log messages"
\r
8406 #: ../source/TortoiseGit_en.xml:11164
\r
8408 msgid "If the standard long messages use up too much space on your screen use the short format."
\r
8411 #: ../source/TortoiseGit_en.xml:11171
\r
8413 msgid "Can double-click in log list to compare with previous revision"
\r
8416 #: ../source/TortoiseGit_en.xml:11173
\r
8418 msgid "If you frequently find yourself comparing revisions in the top pane of the log dialog, you can use this option to allow that action on double-click. It is not enabled by default because fetching the diff is often a long process, and many people prefer to avoid the wait after an accidental double-click, which is why this option is not enabled by default."
\r
8421 #: ../source/TortoiseGit_en.xml:11184
\r
8423 msgid "Progress Dialog"
\r
8426 #: ../source/TortoiseGit_en.xml:11186
\r
8428 msgid "TortoiseGit can automatically close all progress dialogs when the action is finished without error. This setting allows you to select the conditions for closing the dialogs. The default (recommended) setting is <guilabel>Close manually</guilabel> which allows you to review all messages and check what has happened. However, you may decide that you want to ignore some types of message and have the dialog close automatically if there are no critical changes."
\r
8431 #: ../source/TortoiseGit_en.xml:11197
\r
8433 msgid "<guilabel>Auto-close if no merges, adds or deletes</guilabel> means that the progress dialog will close if there were simple updates, but if changes from the repository were merged with yours, or if any files were added or deleted, the dialog will remain open. It will also stay open if there were any conflicts or errors during the operation."
\r
8436 #: ../source/TortoiseGit_en.xml:11205
\r
8438 msgid "<guilabel>Auto-close if no merges, adds or deletes for local operations</guilabel> means that the progress dialog will close as for <guilabel>Auto-close if no merges, adds or deletes</guilabel> but only for local operations like adding files or reverting changes. For remote operations the dialog will stay open."
\r
8441 #: ../source/TortoiseGit_en.xml:11213
\r
8443 msgid "<guilabel>Auto-close if no conflicts</guilabel> relaxes the criteria further and will close the dialog even if there were merges, adds or deletes. However, if there were any conflicts or errors, the dialog remains open."
\r
8446 #: ../source/TortoiseGit_en.xml:11220
\r
8448 msgid "<guilabel>Auto-close if no errors</guilabel> always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date."
\r
8451 #: ../source/TortoiseGit_en.xml:11232
\r
8453 msgid "Use recycle bin when reverting"
\r
8456 #: ../source/TortoiseGit_en.xml:11234
\r
8458 msgid "When you revert local modifications, your changes are discarded. TortoiseGit gives you an extra safety net by sending the modified file to the recycle bin before bringing back the pristine copy. If you prefer to skip the recycle bin, uncheck this option."
\r
8461 #: ../source/TortoiseGit_en.xml:11244
\r
8463 msgid "Use URL of WC as the default <quote>From:</quote> URL"
\r
8466 #: ../source/TortoiseGit_en.xml:11246
\r
8468 msgid "In the merge dialog, the default behaviour is for the <guilabel>From:</guilabel> URL to be remembered between merges. However, some people like to perform merges from many different points in their hierarchy, and find it easier to start out with the URL of the current working copy. This can then be edited to refer to a parallel path on another branch."
\r
8471 #: ../source/TortoiseGit_en.xml:11258
\r
8473 msgid "Default checkout path"
\r
8476 #: ../source/TortoiseGit_en.xml:11260
\r
8478 msgid "You can specify the default path for checkouts. If you keep all your checkouts in one place, it is useful to have the drive and folder pre-filled so you only have to add the new folder name to the end."
\r
8481 #: ../source/TortoiseGit_en.xml:11269
\r
8483 msgid "Default checkout URL"
\r
8486 #: ../source/TortoiseGit_en.xml:11271
\r
8488 msgid "You can also specify the default URL for checkouts. If you often checkout sub-projects of some very large project, it can be useful to have the URL pre-filled so you only have to add the sub-project name to the end."
\r
8491 #: ../source/TortoiseGit_en.xml:11282
\r
8493 msgid "TortoiseGit Dialog Settings 2"
\r
8496 #: ../source/TortoiseGit_en.xml:11286
\r
8498 msgid "The Settings Dialog, Dialogs 2 Page"
\r
8501 #: ../source/TortoiseGit_en.xml:11292
\r
8503 msgid "Recurse into unversioned folders"
\r
8506 #: ../source/TortoiseGit_en.xml:11294
\r
8508 msgid "If this box is checked (default state), then whenever the status of an unversioned folder is shown in the <guilabel>Add</guilabel>, <guilabel>Commit</guilabel> or <guilabel>Check for Modifications</guilabel> dialog, every child file and folder is also shown. If you uncheck this box, only the unversioned parent is shown. Unchecking reduces clutter in these dialogs. In that case if you select an unversioned folder for Add, it is added recursively."
\r
8511 #: ../source/TortoiseGit_en.xml:11308
\r
8513 msgid "Use auto-completion of file paths and keywords"
\r
8516 #: ../source/TortoiseGit_en.xml:11310
\r
8518 msgid "The commit dialog includes a facility to parse the list of filenames being committed. When you type the first 3 letters of an item in the list, the auto-completion box pops up, and you can press Enter to complete the filename. Check the box to enable this feature."
\r
8521 #: ../source/TortoiseGit_en.xml:11320
\r
8523 msgid "Timeout in seconds to stop the auto-completion parsing"
\r
8526 #: ../source/TortoiseGit_en.xml:11322
\r
8528 msgid "The auto-completion parser can be quite slow if there are a lot of large files to check. This timeout stops the commit dialog being held up for too long. If you are missing important auto-completion information, you can extend the timeout."
\r
8531 #: ../source/TortoiseGit_en.xml:11331
\r
8533 msgid "Only use spellchecker when <literal>tsvn:projectlanguage</literal> is set"
\r
8536 #: ../source/TortoiseGit_en.xml:11333
\r
8538 msgid "If you don't wish to use the spellchecker for all commits, check this box. The spellchecker will still be enabled where the project properties require it."
\r
8541 #: ../source/TortoiseGit_en.xml:11341
\r
8543 msgid "Max. items to keep in the log message history"
\r
8546 #: ../source/TortoiseGit_en.xml:11343
\r
8548 msgid "When you type in a log message in the commit dialog, TortoiseGit stores it for possible re-use later. By default it will keep the last 25 log messages for each repository, but you can customize that number here. If you have many different repositories, you may wish to reduce this to avoid filling your registry."
\r
8551 #: ../source/TortoiseGit_en.xml:11351
\r
8553 msgid "Note that this setting applies only to messages that you type in on this computer. It has nothing to do with the log cache."
\r
8556 #: ../source/TortoiseGit_en.xml:11358
\r
8558 msgid "Re-open commit and branch/tag dialog after a commit failed"
\r
8561 #: ../source/TortoiseGit_en.xml:11360
\r
8563 msgid "When a commit fails for some reason (working copy needs updating, pre-commit hook rejects commit, network error, etc), you can select this option to keep the commit dialog open ready to try again. However, you should be aware that this can lead to problems. If the failure means you need to update your working copy, and that update leads to conflicts you must resolve those first."
\r
8566 #: ../source/TortoiseGit_en.xml:11371
\r
8568 msgid "Select items automatically"
\r
8571 #: ../source/TortoiseGit_en.xml:11373
\r
8573 msgid "The normal behaviour in the commit dialog is for all modified (versioned) items to be selected for commit automatically. If you prefer to start with nothing selected and pick the items for commit manually, uncheck this box."
\r
8576 #: ../source/TortoiseGit_en.xml:11382
\r
8578 msgid "Contact the repository on startup"
\r
8581 #: ../source/TortoiseGit_en.xml:11384
\r
8583 msgid "The Check for Modifications dialog checks the working copy by default, and only contacts the repository when you click <guibutton>Check repository</guibutton>. If you always want to check the repository, you can use this setting to make that action happen automatically."
\r
8586 #: ../source/TortoiseGit_en.xml:11394
\r
8588 msgid "Show Lock dialog before locking files"
\r
8591 #: ../source/TortoiseGit_en.xml:11396
\r
8593 msgid "When you select one or more files and then use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Lock</guimenuitem></menuchoice> to take out a lock on those files, on some projects it is customary to write a lock message explaining why you have locked the files. If you do not use lock messages, you can uncheck this box to skip that dialog and lock the files immediately."
\r
8596 #: ../source/TortoiseGit_en.xml:11408
\r
8598 msgid "If you use the lock command on a folder, you are always presented with the lock dialog as that also gives you the option to select files for locking."
\r
8601 #: ../source/TortoiseGit_en.xml:11413
\r
8603 msgid "If your project is using the <literal>tsvn:lockmsgminsize</literal> property, you will see the lock dialog regardless of this setting because the project <emphasis>requires</emphasis> lock messages."
\r
8606 #: ../source/TortoiseGit_en.xml:11423
\r
8608 msgid "TortoiseGit Colour Settings"
\r
8611 #: ../source/TortoiseGit_en.xml:11427
\r
8613 msgid "The Settings Dialog, Colours Page"
\r
8616 #: ../source/TortoiseGit_en.xml:11425
\r
8618 msgid "<placeholder-1/> This dialog allows you to configure the text colours used in TortoiseGit's dialogs the way you like them."
\r
8621 #: ../source/TortoiseGit_en.xml:11435
\r
8623 msgid "Possible or real conflict / obstructed"
\r
8626 #: ../source/TortoiseGit_en.xml:11437
\r
8628 msgid "A conflict has occurred during update, or may occur during merge. Update is obstructed by an existing unversioned file/folder of the same name as a versioned one."
\r
8631 #: ../source/TortoiseGit_en.xml:11442
\r
8633 msgid "This colour is also used for error messages in the progress dialogs."
\r
8636 #: ../source/TortoiseGit_en.xml:11448
\r
8638 msgid "Added files"
\r
8641 #: ../source/TortoiseGit_en.xml:11450
\r
8643 msgid "Items added to the repository."
\r
8646 #: ../source/TortoiseGit_en.xml:11456
\r
8648 msgid "Missing / deleted / replaced"
\r
8651 #: ../source/TortoiseGit_en.xml:11458
\r
8653 msgid "Items deleted from the repository, missing from the working copy, or deleted from the working copy and replaced with another file of the same name."
\r
8656 #: ../source/TortoiseGit_en.xml:11466
\r
8661 #: ../source/TortoiseGit_en.xml:11468
\r
8663 msgid "Changes from the repository successfully merged into the WC without creating any conflicts."
\r
8666 #: ../source/TortoiseGit_en.xml:11475
\r
8668 msgid "Modified / copied"
\r
8671 #: ../source/TortoiseGit_en.xml:11477
\r
8673 msgid "Add with history, or paths copied in the repository. Also used in the log dialog for entries which include copied items."
\r
8676 #: ../source/TortoiseGit_en.xml:11485
\r
8678 msgid "Deleted node"
\r
8681 #: ../source/TortoiseGit_en.xml:11487
\r
8683 msgid "An item which has been deleted from the repository."
\r
8686 #: ../source/TortoiseGit_en.xml:11493
\r
8688 msgid "Added node"
\r
8691 #: ../source/TortoiseGit_en.xml:11495
\r
8693 msgid "An item which has been added to the repository, by an add, copy or move operation."
\r
8696 #: ../source/TortoiseGit_en.xml:11502
\r
8698 msgid "Renamed node"
\r
8701 #: ../source/TortoiseGit_en.xml:11504
\r
8703 msgid "An item which has been renamed within the repository."
\r
8706 #: ../source/TortoiseGit_en.xml:11510
\r
8708 msgid "Replaced node"
\r
8711 #: ../source/TortoiseGit_en.xml:11512
\r
8713 msgid "The original item has been deleted and a new item with the same name replaces it."
\r
8716 #: ../source/TortoiseGit_en.xml:11522
\r
8718 msgid "Icon Overlay Settings"
\r
8721 #: ../source/TortoiseGit_en.xml:11526
\r
8723 msgid "The Settings Dialog, Icon Overlays Page"
\r
8726 #: ../source/TortoiseGit_en.xml:11524
\r
8728 msgid "<placeholder-1/> This page allows you to choose the items for which TortoiseGit will display icon overlays."
\r
8731 #: ../source/TortoiseGit_en.xml:11532
\r
8733 msgid "By default, overlay icons and context menus will appear in all open/save dialogs as well as in Windows Explorer. If you want them to appear <emphasis>only</emphasis> in Windows Explorer, check the <guilabel>Show overlays and context menu only in explorer</guilabel> box."
\r
8736 #: ../source/TortoiseGit_en.xml:11538
\r
8738 msgid "Ignored items and Unversioned items are not usually given an overlay. If you want to show an overlay in these cases, just check the boxes."
\r
8741 #: ../source/TortoiseGit_en.xml:11542
\r
8743 msgid "You can also choose to mark folders as modified if they contain unversioned items. This could be useful for reminding you that you have created new files which are not yet versioned. This option is only available when you use the <emphasis>default</emphasis> status cache option (see below)."
\r
8746 #: ../source/TortoiseGit_en.xml:11557
\r
8751 #: ../source/TortoiseGit_en.xml:11559
\r
8753 msgid "Caches all status information in a separate process (<filename>TSVNCache.exe</filename>). That process watches all drives for changes and fetches the status again if files inside a working copy get modified. The process runs with the least possible priority so other programs don't get hogged because of it. That also means that the status information is not <emphasis>real time</emphasis> but it can take a few seconds for the overlays to change."
\r
8756 #: ../source/TortoiseGit_en.xml:11570
\r
8758 msgid "Advantage: the overlays show the status recursively, i.e. if a file deep inside a working copy is modified, all folders up to the working copy root will also show the modified overlay. And since the process can send notifications to the shell, the overlays on the left tree view usually change too."
\r
8761 #: ../source/TortoiseGit_en.xml:11578
\r
8763 msgid "Disadvantage: the process runs constantly, even if you're not working on your projects. It also uses around 10-50 MB of RAM depending on number and size of your working copies."
\r
8766 #: ../source/TortoiseGit_en.xml:11586
\r
8771 #: ../source/TortoiseGit_en.xml:11588
\r
8773 msgid "Caching is done directly inside the shell extension dll, but only for the currently visible folder. Each time you navigate to another folder, the status information is fetched again."
\r
8776 #: ../source/TortoiseGit_en.xml:11594
\r
8778 msgid "Advantage: needs only very little memory (around 1 MB of RAM) and can show the status in <emphasis>real time</emphasis>."
\r
8781 #: ../source/TortoiseGit_en.xml:11598
\r
8783 msgid "Disadvantage: Since only one folder is cached, the overlays don't show the status recursively. For big working copies, it can take more time to show a folder in explorer than with the default cache. Also the mime-type column is not available."
\r
8786 #: ../source/TortoiseGit_en.xml:11608
\r
8791 #: ../source/TortoiseGit_en.xml:11610
\r
8793 msgid "With this setting, the TortoiseGit does not fetch the status at all in Explorer. Because of that, files don't get an overlay and folders only get a 'normal' overlay if they're versioned. No other overlays are shown, and no extra columns are available either."
\r
8796 #: ../source/TortoiseGit_en.xml:11617
\r
8798 msgid "Advantage: uses absolutely no additional memory and does not slow down the Explorer at all while browsing."
\r
8801 #: ../source/TortoiseGit_en.xml:11621
\r
8803 msgid "Disadvantage: Status information of files and folders is not shown in Explorer. To see if your working copies are modified, you have to use the <quote>Check for modifications</quote> dialog."
\r
8806 #: ../source/TortoiseGit_en.xml:11549
\r
8808 msgid "Since it takes quite a while to fetch the status of a working copy, TortoiseGit uses a cache to store the status so the explorer doesn't get hogged too much when showing the overlays. You can choose which type of cache TortoiseGit should use according to your system and working copy size here: <placeholder-1/>"
\r
8811 #: ../source/TortoiseGit_en.xml:11630
\r
8813 msgid "The next group allows you to select which classes of storage should show overlays. By default, only hard drives are selected. You can even disable all icon overlays, but where's the fun in that?"
\r
8816 #: ../source/TortoiseGit_en.xml:11635
\r
8818 msgid "Network drives can be very slow, so by default icons are not shown for working copies located on network shares."
\r
8821 #: ../source/TortoiseGit_en.xml:11639
\r
8823 msgid "USB Flash drives appear to be a special case in that the drive type is identified by the device itself. Some appear as fixed drives, and some as removable drives."
\r
8826 #: ../source/TortoiseGit_en.xml:11644
\r
8828 msgid "The <guilabel>Exclude Paths</guilabel> are used to tell TortoiseGit those paths for which it should <emphasis>not</emphasis> show icon overlays and status columns. This is useful if you have some very big working copies containing only libraries which you won't change at all and therefore don't need the overlays. For example:"
\r
8831 #: ../source/TortoiseGit_en.xml:11652
\r
8833 msgid "<filename>f:\\development\\SVN\\Git</filename> will disable the overlays <emphasis>only</emphasis> on that specific folder. You still can see the overlays on all files and folder inside that folder."
\r
8836 #: ../source/TortoiseGit_en.xml:11657
\r
8838 msgid "<filename>f:\\development\\SVN\\Git*</filename> will disable the overlays on <emphasis>all</emphasis> files and folders whose path starts with <filename>f:\\development\\SVN\\Git</filename>. That means you won't see overlays for any files and folders below that path."
\r
8841 #: ../source/TortoiseGit_en.xml:11664
\r
8843 msgid "The same applies to the <guilabel>Include Paths</guilabel>. Except that for those paths the overlays are shown even if the overlays are disabled for that specific drive type, or by an exclude path specified above."
\r
8846 #: ../source/TortoiseGit_en.xml:11669
\r
8848 msgid "Users sometimes ask how these three settings interact, and the definitive answer is: <screen>\nif (path is in include list)\n show overlays\nif (path is allowed drive type) AND (path is not in exclude list)\n show overlays\n</screen> The include list <emphasis>always</emphasis> makes the overlays show. Otherwise, overlays are shown for all marked drive types <emphasis>unless</emphasis> the path is excluded."
\r
8851 #: ../source/TortoiseGit_en.xml:11682
\r
8853 msgid "TSVNCache.exe also uses these paths to restrict its scanning. If you want it to look only in particular folders, disable all drive types and include only the folders you specifically want to be scanned."
\r
8856 #: ../source/TortoiseGit_en.xml:11688
\r
8858 msgid "Exclude <literal>SUBST</literal> Drives"
\r
8861 #: ../source/TortoiseGit_en.xml:11690
\r
8863 msgid "SUBST drives"
\r
8866 #: ../source/TortoiseGit_en.xml:11692
\r
8868 msgid "It is often convenient to use a <literal>SUBST</literal> drive to access your working copies, e.g. using the command <screen>\nsubst T: C:\\TortoiseGit\\trunk\\doc\n</screen> However this can cause the overlays not to update, as <literal>TSVNCache</literal> will only receive one notification when a file changes, and that is normally for the original path. This means that your overlays on the <literal>subst</literal> path may never be updated."
\r
8871 #: ../source/TortoiseGit_en.xml:11704
\r
8873 msgid "An easy way to work around this is to exclude the original path from showing overlays, so that the overlays show up on the <literal>subst</literal> path instead."
\r
8876 #: ../source/TortoiseGit_en.xml:11710
\r
8878 msgid "Sometimes you will exclude areas that contain working copies, which saves TSVNCache from scanning and monitoring for changes, but you still want a visual indication that such folders are versioned. The <guilabel>Show excluded folders as 'normal'</guilabel> checkbox allows you to do this. With this option, versioned folders in any excluded area (drive type not checked, or specifically excluded) will show up as normal and up-to-date, with a green check mark. This reminds you that you are looking at a working copy, even though the folder overlays may not be correct. Files do not get an overlay at all. Note that the context menus still work, even though the overlays are not shown."
\r
8881 #: ../source/TortoiseGit_en.xml:11723
\r
8883 msgid "As a special exception to this, drives <literal>A:</literal> and <literal>B:</literal> are never considered for the <guilabel>Show excluded folders as 'normal'</guilabel> option. This is because Windows is forced to look on the drive, which can result in a delay of several seconds when starting Explorer, even if your PC does have a floppy drive."
\r
8886 #: ../source/TortoiseGit_en.xml:11732
\r
8888 msgid "Icon Set Selection"
\r
8891 #: ../source/TortoiseGit_en.xml:11736
\r
8893 msgid "The Settings Dialog, Icon Set Page"
\r
8896 #: ../source/TortoiseGit_en.xml:11734
\r
8898 msgid "<placeholder-1/> You can change the overlay icon set to the one you like best. Note that if you change overlay set, you may have to restart your computer for the changes to take effect."
\r
8901 #: ../source/TortoiseGit_en.xml:11747
\r
8903 msgid "Network Settings"
\r
8906 #: ../source/TortoiseGit_en.xml:11749
\r
8908 msgid "proxy server"
\r
8911 #: ../source/TortoiseGit_en.xml:11753
\r
8913 msgid "The Settings Dialog, Network Page"
\r
8916 #: ../source/TortoiseGit_en.xml:11751
\r
8918 msgid "<placeholder-1/> Here you can configure your proxy server, if you need one to get through your company's firewall."
\r
8921 #: ../source/TortoiseGit_en.xml:11759
\r
8923 msgid "If you need to set up per-repository proxy settings, you will need to use the Git <filename>servers</filename> file to configure this. Use <guibutton>Edit</guibutton> to get there directly. Consult the <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.advanced.confarea.html\"><citetitle>Runtime Configuration Area</citetitle></ulink> for details on how to use this file."
\r
8926 #: ../source/TortoiseGit_en.xml:11769
\r
8928 msgid "You can also specify which program TortoiseGit should use to establish a secure connection to a svn+ssh repository. We recommend that you use TortoisePlink.exe. This is a version of the popular Plink program, and is included with TortoiseGit, but it is compiled as a Windowless app, so you don't get a DOS box popping up every time you authenticate."
\r
8931 #: ../source/TortoiseGit_en.xml:11777
\r
8933 msgid "You must specify the full path to the executable. For TortoisePlink.exe this is the standard TortoiseGit bin directory. Use the <guibutton>Browse</guibutton> button to help locate it. Note that if the path contains spaces, you must enclose it in quotes, e.g. <screen>\n\"C:\\Program Files\\TortoiseGit\\bin\\TortoisePlink.exe\"\n</screen>"
\r
8936 #: ../source/TortoiseGit_en.xml:11787
\r
8938 msgid "One side-effect of not having a window is that there is nowhere for any error messages to go, so if authentication fails you will simply get a message saying something like <quote>Unable to write to standard output</quote>. For this reason we recommend that you first set up using standard Plink. When everything is working, you can use TortoisePlink with exactly the same parameters."
\r
8941 #: ../source/TortoiseGit_en.xml:11796
\r
8943 msgid "TortoisePlink does not have any documentation of its own because it is just a minor variant of Plink. Find out about command line parameters from the <ulink url=\"http://www.chiark.greenend.org.uk/~sgtatham/putty/\"><citetitle>PuTTY website</citetitle></ulink>"
\r
8946 #: ../source/TortoiseGit_en.xml:11804
\r
8948 msgid "To avoid being prompted for a password repeatedly, you might also consider using a password caching tool such as Pageant. This is also available for download from the PuTTY website."
\r
8951 #: ../source/TortoiseGit_en.xml:11809
\r
8953 msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under <ulink url=\"http://TortoiseGit.net/ssh_howto\"><citetitle>Git/TortoiseGit SSH How-To</citetitle></ulink>."
\r
8956 #: ../source/TortoiseGit_en.xml:11819
\r
8958 msgid "External Program Settings"
\r
8961 #: ../source/TortoiseGit_en.xml:11822
\r
8963 msgid "The Settings Dialog, Diff Viewer Page"
\r
8966 #: ../source/TortoiseGit_en.xml:11820
\r
8968 msgid "<placeholder-1/> Here you can define your own diff/merge programs that TortoiseGit should use. The default setting is to use TortoiseMerge which is installed alongside TortoiseGit."
\r
8971 #: ../source/TortoiseGit_en.xml:11830
\r
8973 msgid "Read <xref linkend=\"tsvn-dug-diff-tools\"/> for a list of some of the external diff/merge programs that people are using with TortoiseGit."
\r
8976 #: ../source/TortoiseGit_en.xml:11835
\r
8978 msgid "Diff Viewer"
\r
8981 #: ../source/TortoiseGit_en.xml:11850
\r
8983 msgid "The original file without your changes"
\r
8986 #: ../source/TortoiseGit_en.xml:11858
\r
8988 #: ../source/TortoiseGit_en.xml:11967
\r
8990 msgid "The window title for the base file"
\r
8993 #: ../source/TortoiseGit_en.xml:11866
\r
8995 msgid "Your own file, with your changes"
\r
8998 #: ../source/TortoiseGit_en.xml:11874
\r
9000 #: ../source/TortoiseGit_en.xml:11983
\r
9002 msgid "The window title for your file"
\r
9005 #: ../source/TortoiseGit_en.xml:11837
\r
9007 msgid "An external diff program may be used for comparing different revisions of files. The external program will need to obtain the filenames from the command line, along with any other command line options. TortoiseGit uses substitution parameters prefixed with <literal>%</literal>. When it encounters one of these it will substitute the appropriate value. The order of the parameters will depend on the Diff program you use. <placeholder-1/>"
\r
9010 #: ../source/TortoiseGit_en.xml:11881
\r
9012 msgid "The window titles are not pure filenames. TortoiseGit treats that as a name to display and creates the names accordingly. So e.g. if you're doing a diff from a file in revision 123 with a file in your working copy, the names will be <filename>filename : revision 123</filename> and <filename>filename : working copy</filename>"
\r
9015 #: ../source/TortoiseGit_en.xml:11891
\r
9017 msgid "For example, with ExamDiff Pro: <screen>\nC:\\Path-To\\ExamDiff.exe %base %mine --left_display_name:%bname\n --right_display_name:%yname\n</screen> or with KDiff3: <screen>\nC:\\Path-To\\kdiff3.exe %base %mine --L1 %bname --L2 %yname\n</screen> or with WinMerge: <screen>\nC:\\Path-To\\WinMerge.exe -e -ub -dl %bname -dr %yname %base %mine\n</screen> or with Araxis: <screen>\nC:\\Path-To\\compare.exe /max /wait /title1:%bname /title2:%yname\n %base %mine\n</screen>"
\r
9020 #: ../source/TortoiseGit_en.xml:11911
\r
9022 msgid "If you use the <literal>svn:keywords</literal> property to expand keywords, and in particular the <emphasis>revision</emphasis> of a file, then there may be a difference between files which is purely due to the current value of the keyword. Also if you use <literal>svn:eol-style = native</literal> the BASE file will have pure <literal>LF</literal> line endings whereas your file will have <literal>CR-LF</literal> line endings. TortoiseGit will normally hide these differences automatically by first parsing the BASE file to expand keywords and line endings before doing the diff operation. However, this can take a long time with large files. If <guilabel>Convert files when diffing against BASE</guilabel> is unchecked then TortoiseGit will skip pre-processing the files."
\r
9025 #: ../source/TortoiseGit_en.xml:11925
\r
9027 msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer."
\r
9030 #: ../source/TortoiseGit_en.xml:11930
\r
9032 msgid "If you have configured an alternate diff tool, you can access TortoiseMerge <emphasis>and</emphasis> the third party tool from the context menus. <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Diff</guimenuitem></menuchoice> uses the primary diff tool, and <keycap>Shift</keycap>+ <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Diff</guimenuitem></menuchoice> uses the secondary diff tool."
\r
9035 #: ../source/TortoiseGit_en.xml:11948
\r
9037 msgid "Merge Tool"
\r
9040 #: ../source/TortoiseGit_en.xml:11958
\r
9042 msgid "the original file without your or the others changes"
\r
9045 #: ../source/TortoiseGit_en.xml:11975
\r
9047 msgid "your own file, with your changes"
\r
9050 #: ../source/TortoiseGit_en.xml:11991
\r
9052 msgid "the file as it is in the repository"
\r
9055 #: ../source/TortoiseGit_en.xml:11999
\r
9057 msgid "The window title for the file in the repository"
\r
9060 #: ../source/TortoiseGit_en.xml:12007
\r
9062 msgid "the conflicted file, the result of the merge operation"
\r
9065 #: ../source/TortoiseGit_en.xml:12016
\r
9067 msgid "The window title for the merged file"
\r
9070 #: ../source/TortoiseGit_en.xml:11950
\r
9072 msgid "An external merge program used to resolve conflicted files. Parameter substitution is used in the same way as with the Diff Program. <placeholder-1/>"
\r
9075 #: ../source/TortoiseGit_en.xml:12023
\r
9077 msgid "For example, with Perforce Merge: <screen>\nC:\\Path-To\\P4Merge.exe %base %theirs %mine %merged\n</screen> or with KDiff3: <screen>\nC:\\Path-To\\kdiff3.exe %base %mine %theirs -o %merged\n --L1 %bname --L2 %yname --L3 %tname\n</screen> or with Araxis: <screen>\nC:\\Path-To\\compare.exe /max /wait /3 /title1:%tname /title2:%bname\n /title3:%yname %theirs %base %mine %merged /a2\n</screen> or with WinMerge (2.8 or later): <screen>\nC:\\Path-To\\WinMerge.exe %merged\n</screen>"
\r
9080 #: ../source/TortoiseGit_en.xml:12045
\r
9082 msgid "Diff/Merge Advanced Settings"
\r
9085 #: ../source/TortoiseGit_en.xml:12049
\r
9087 msgid "The Settings Dialog, Diff/Merge Advanced Dialog"
\r
9090 #: ../source/TortoiseGit_en.xml:12047
\r
9092 msgid "<placeholder-1/> In the advanced settings, you can define a different diff and merge program for every file extension. For instance you could associate Photoshop as the <quote>Diff</quote> Program for <filename>.jpg</filename> files :-) You can also associate the <literal>svn:mime-type</literal> property with a diff or merge program."
\r
9095 #: ../source/TortoiseGit_en.xml:12058
\r
9097 msgid "To associate using a file extension, you need to specify the extension. Use <literal>.bmp</literal> to describe Windows bitmap files. To associate using the <literal>svn:mime-type</literal> property, specify the mime type, including a slash, for example <literal>text/xml</literal>."
\r
9100 #: ../source/TortoiseGit_en.xml:12067
\r
9102 msgid "Unified Diff Viewer"
\r
9105 #: ../source/TortoiseGit_en.xml:12069
\r
9107 msgid "A viewer program for unified-diff files (patch files). No parameters are required. The <guilabel>Default</guilabel> option is to check for a file association for <filename>.diff</filename> files, and then for <filename>.txt</filename> files. If you don't have a viewer for <filename>.diff</filename> files, you will most likely get NotePad."
\r
9110 #: ../source/TortoiseGit_en.xml:12078
\r
9112 msgid "The original Windows NotePad program does not behave well on files which do not have standard CR-LF line-endings. Since most unified diff files have pure LF line-endings, they do not view well in NotePad. However, you can download a free NotePad replacement <ulink url=\"http://www.flos-freeware.ch/notepad2.html\"><citetitle>Notepad2</citetitle></ulink> which not only displays the line-endings correctly, but also colour codes the added and removed lines."
\r
9115 #: ../source/TortoiseGit_en.xml:12094
\r
9117 msgid "Saved Data Settings"
\r
9120 #: ../source/TortoiseGit_en.xml:12097
\r
9122 msgid "The Settings Dialog, Saved Data Page"
\r
9125 #: ../source/TortoiseGit_en.xml:12095
\r
9127 msgid "<placeholder-1/> For your convenience, TortoiseGit saves many of the settings you use, and remembers where you have been lately. If you want to clear out that cache of data, you can do it here."
\r
9130 #: ../source/TortoiseGit_en.xml:12106
\r
9132 msgid "URL history"
\r
9135 #: ../source/TortoiseGit_en.xml:12108
\r
9137 msgid "Whenever you checkout a working copy, merge changes or use the repository browser, TortoiseGit keeps a record of recently used URLs and offers them in a combo box. Sometimes that list gets cluttered with outdated URLs so it is useful to flush it out periodically."
\r
9140 #: ../source/TortoiseGit_en.xml:12115
\r
9142 msgid "If you want to remove a single item from one of the combo boxes you can do that in-place. Just click on the arrow to drop the combo box down, move the mouse over the item you want to remove and type <keycap>Shift+Del</keycap>."
\r
9145 #: ../source/TortoiseGit_en.xml:12124
\r
9147 msgid "Log messages (Input dialog)"
\r
9150 #: ../source/TortoiseGit_en.xml:12126
\r
9152 msgid "TortoiseGit stores recent commit log messages that you enter. These are stored per repository, so if you access many repositories this list can grow quite large."
\r
9155 #: ../source/TortoiseGit_en.xml:12134
\r
9157 msgid "Log messages (Show log dialog)"
\r
9160 #: ../source/TortoiseGit_en.xml:12136
\r
9162 msgid "TortoiseGit caches log messages fetched by the Show Log dialog to save time when you next show the log. If someone else edits a log message and you already have that message cached, you will not see the change until you clear the cache. Log message caching is enabled on the <guilabel>Log Cache</guilabel> tab."
\r
9165 #: ../source/TortoiseGit_en.xml:12147
\r
9167 msgid "Dialog sizes and positions"
\r
9170 #: ../source/TortoiseGit_en.xml:12149
\r
9172 msgid "Many dialogs remember the size and screen position that you last used."
\r
9175 #: ../source/TortoiseGit_en.xml:12156
\r
9177 msgid "Authentication data"
\r
9180 #: ../source/TortoiseGit_en.xml:12158
\r
9182 msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?"
\r
9185 #: ../source/TortoiseGit_en.xml:12165
\r
9187 msgid "If you want to clear authentication data for one particular server only, read <xref linkend=\"tsvn-dug-general-auth\"/> for instructions on how to find the cached data."
\r
9190 #: ../source/TortoiseGit_en.xml:12173
\r
9192 msgid "Action log"
\r
9195 #: ../source/TortoiseGit_en.xml:12175
\r
9197 msgid "TortoiseGit keeps a log of everything written to its progress dialogs. This can be useful when, for example, you want to check what happened in a recent update command."
\r
9200 #: ../source/TortoiseGit_en.xml:12180
\r
9202 msgid "The log file is limited in length and when it grows too big the oldest content is discarded. By default 4000 lines are kept, but you can customize that number."
\r
9205 #: ../source/TortoiseGit_en.xml:12185
\r
9207 msgid "From here you can view the log file content, and also clear it."
\r
9210 #: ../source/TortoiseGit_en.xml:12194
\r
9212 msgid "Log Caching"
\r
9215 #: ../source/TortoiseGit_en.xml:12196
\r
9220 #: ../source/TortoiseGit_en.xml:12200
\r
9222 msgid "The Settings Dialog, Log Cache Page"
\r
9225 #: ../source/TortoiseGit_en.xml:12198
\r
9227 msgid "<placeholder-1/> This dialog allows you to configure the log caching feature of TortoiseGit, which retains a local copy of log messages and changed paths to avoid time-consuming downloads from the server. Using the log cache can dramatically speed up the log dialog and the revision graph. Another useful feature is that the log messages can still be accessed when offline."
\r
9230 #: ../source/TortoiseGit_en.xml:12213
\r
9232 msgid "Enable log caching"
\r
9235 #: ../source/TortoiseGit_en.xml:12215
\r
9237 msgid "Enables log caching whenever log data is requested. If checked, data will be retrieved from the cache when available, and any messages not in the cache will be retrieved from the server and added to the cache."
\r
9240 #: ../source/TortoiseGit_en.xml:12221
\r
9242 msgid "If caching is disabled, data will always be retrieved directly from the server and not stored locally."
\r
9245 #: ../source/TortoiseGit_en.xml:12228
\r
9247 msgid "Allow ambiguous URLs"
\r
9250 #: ../source/TortoiseGit_en.xml:12230
\r
9252 msgid "Occasionally you may have to connect to a server which uses the same URL for all repositories. Older versions of <literal>svnbridge</literal> would do this. If you need to access such repositories you will have to check this option. If you don't, leave it unchecked to improve performance."
\r
9255 #: ../source/TortoiseGit_en.xml:12240
\r
9257 msgid "Allow ambiguous UUIDs"
\r
9260 #: ../source/TortoiseGit_en.xml:12242
\r
9262 msgid "Some hosting services give all their repositories the same UUID. You may even have done this yourself by copying a repository folder to create a new one. For all sorts of reasons this is a bad idea - a UUID should be <emphasis>unique</emphasis>. However, the log cache will still work in this situation if you check this box. If you don't need it, leave it unchecked to improve performance."
\r
9265 #: ../source/TortoiseGit_en.xml:12254
\r
9267 msgid "If the repository cannot be contacted"
\r
9270 #: ../source/TortoiseGit_en.xml:12256
\r
9272 msgid "If you are working offline, or if the repository server is down, the log cache can still be used to supply log messages already held in the cache. Of course the cache may not be up-to-date, so there are options to allow you to select whether this feature should be used."
\r
9275 #: ../source/TortoiseGit_en.xml:12263
\r
9277 msgid "When log data is being taken from the cache without contacting the server, the dialog using those message will show the offline state in its title bar."
\r
9280 #: ../source/TortoiseGit_en.xml:12271
\r
9282 msgid "Timeout before updating the HEAD revision"
\r
9285 #: ../source/TortoiseGit_en.xml:12273
\r
9287 msgid "When you invoke the log dialog you will normally want to contact the server to check for any newer log messages. If the timeout set here is non-zero then the server will only be contacted when the timeout has elapsed since the last time contact. This can reduce server round-trips if you open the log dialog frequently and the server is slow, but the data shown may not be completely up-to-date. If you want to use this feature we suggest using a value of 300 (5 minutes) as a compromise."
\r
9290 #: ../source/TortoiseGit_en.xml:12287
\r
9292 msgid "Days of inactivity until small caches get removed"
\r
9295 #: ../source/TortoiseGit_en.xml:12289
\r
9297 msgid "If you browse around a lot of repositories you will accumulate a lot of log caches. If you're not actively using them, the cache will not grow very big, so TortoiseGit purges them after a set time by default. Use this item to control cache purging."
\r
9300 #: ../source/TortoiseGit_en.xml:12299
\r
9302 msgid "Maximum size of removed inactive caches"
\r
9305 #: ../source/TortoiseGit_en.xml:12301
\r
9307 msgid "Larger caches are more expensive to reacquire, so TortoiseGit only purges small caches. Fine tune the threshold with this value."
\r
9310 #: ../source/TortoiseGit_en.xml:12309
\r
9312 msgid "Maximum number of tool failures before cache removal"
\r
9315 #: ../source/TortoiseGit_en.xml:12311
\r
9317 msgid "Occasionally something goes wrong with the caching and causes a crash. If this happens the cache is normally deleted automatically to prevent a recurrence of the problem. If you use the less stable nightly build you may opt to keep the cache anyway."
\r
9320 #: ../source/TortoiseGit_en.xml:12322
\r
9322 msgid "On the next page you can see a list of the repositories that are cached locally, and the space used for the cache. If you select one of the repositories you can then use the buttons underneath."
\r
9325 #: ../source/TortoiseGit_en.xml:12329
\r
9327 msgid "Log Cache Statistics"
\r
9330 #: ../source/TortoiseGit_en.xml:12332
\r
9332 msgid "The Settings Dialog, Log Cache Statistics"
\r
9335 #: ../source/TortoiseGit_en.xml:12341
\r
9340 #: ../source/TortoiseGit_en.xml:12343
\r
9342 msgid "The amount of memory required to service this cache."
\r
9345 #: ../source/TortoiseGit_en.xml:12349
\r
9350 #: ../source/TortoiseGit_en.xml:12351
\r
9352 msgid "The amount of disk space used for the cache. Data is compressed, so disk usage is generally fairly modest."
\r
9355 #: ../source/TortoiseGit_en.xml:12358
\r
9357 msgid "Connection"
\r
9360 #: ../source/TortoiseGit_en.xml:12360
\r
9362 msgid "Shows whether the repository was available last time the cache was used."
\r
9365 #: ../source/TortoiseGit_en.xml:12367
\r
9367 msgid "Last update"
\r
9370 #: ../source/TortoiseGit_en.xml:12369
\r
9372 msgid "The last time the cache content was changed."
\r
9375 #: ../source/TortoiseGit_en.xml:12375
\r
9377 msgid "Last head update"
\r
9380 #: ../source/TortoiseGit_en.xml:12377
\r
9382 msgid "The last time we requested the HEAD revision from the server."
\r
9385 #: ../source/TortoiseGit_en.xml:12384
\r
9390 #: ../source/TortoiseGit_en.xml:12386
\r
9392 msgid "The number of different authors with messages recorded in the cache."
\r
9395 #: ../source/TortoiseGit_en.xml:12393
\r
9400 #: ../source/TortoiseGit_en.xml:12395
\r
9402 msgid "The number of paths listed, as you would see using <literal>svn log -v</literal>."
\r
9405 #: ../source/TortoiseGit_en.xml:12402
\r
9407 msgid "Skip ranges"
\r
9410 #: ../source/TortoiseGit_en.xml:12404
\r
9412 msgid "The number of revision ranges which we have not fetched, simply because they haven't been requested. This is a measure of the number of holes in the cache."
\r
9415 #: ../source/TortoiseGit_en.xml:12412
\r
9417 msgid "Max revision"
\r
9420 #: ../source/TortoiseGit_en.xml:12414
\r
9422 msgid "The highest revision number stored in the cache."
\r
9425 #: ../source/TortoiseGit_en.xml:12420
\r
9427 msgid "Revision count"
\r
9430 #: ../source/TortoiseGit_en.xml:12422
\r
9432 msgid "The number of revisions stored in the cache. This is another measure of cache completeness."
\r
9435 #: ../source/TortoiseGit_en.xml:12330
\r
9437 msgid "<placeholder-1/> Click on the <guibutton>Details</guibutton> button to see detailed statistics for a particular cache. Many of the fields shown here are mainly of interest to the developers of TortoiseGit, so they are not all described in detail. <placeholder-2/>"
\r
9440 #: ../source/TortoiseGit_en.xml:12431
\r
9442 msgid "Click on the <guibutton>Update</guibutton> to completely refresh the cache and fill in any holes. For a large repository this could be very time consuming, but useful if you are about to go offline and want the best available cache."
\r
9445 #: ../source/TortoiseGit_en.xml:12437
\r
9447 msgid "Click on the <guibutton>Export</guibutton> button to export the entire cache as a set of CSV files. This could be useful if you want to process the log data using an external program, although it is mainly useful to the developers."
\r
9450 #: ../source/TortoiseGit_en.xml:12443
\r
9452 msgid "Click on <guibutton>Delete</guibutton> to remove all cached data for the selected repositories. This does not disable caching for the repository so the next time you request log data, a new cache will be created."
\r
9455 #: ../source/TortoiseGit_en.xml:12450
\r
9457 msgid "Client Side Hook Scripts"
\r
9460 #: ../source/TortoiseGit_en.xml:12454
\r
9462 msgid "client hooks"
\r
9465 #: ../source/TortoiseGit_en.xml:12461
\r
9467 msgid "The Settings Dialog, Hook Scripts Page"
\r
9470 #: ../source/TortoiseGit_en.xml:12459
\r
9472 msgid "<placeholder-1/> This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in <xref linkend=\"tsvn-repository-hooks\"/>, these scripts are executed locally on the client."
\r
9475 #: ../source/TortoiseGit_en.xml:12469
\r
9477 msgid "One application for such hooks might be to call a program like <literal>SubWCRev.exe</literal> to update version numbers after a commit, and perhaps to trigger a rebuild."
\r
9480 #: ../source/TortoiseGit_en.xml:12474
\r
9482 msgid "For various security and implementation reasons, hook scripts are defined locally on a machine, rather than as project properties. You define what happens, no matter what someone else commits to the repository. Of course you can always choose to call a script which is itself under version control."
\r
9485 #: ../source/TortoiseGit_en.xml:12482
\r
9487 msgid "The Settings Dialog, Configure Hook Scripts"
\r
9490 #: ../source/TortoiseGit_en.xml:12480
\r
9492 msgid "<placeholder-1/> To add a new hook script, simply click <guibutton>Add</guibutton> and fill in the details."
\r
9495 #: ../source/TortoiseGit_en.xml:12492
\r
9497 #: ../source/TortoiseGit_en.xml:12565
\r
9499 msgid "Start-commit"
\r
9502 #: ../source/TortoiseGit_en.xml:12494
\r
9504 msgid "Called before the commit dialog is shown. You might want to use this if the hook modifies a versioned file and affects the list of files that need to be committed and/or commit message. However you should note that because the hook is called at an early stage, the full list of objects selected for commit is not available."
\r
9507 #: ../source/TortoiseGit_en.xml:12505
\r
9509 #: ../source/TortoiseGit_en.xml:12569
\r
9511 msgid "Pre-commit"
\r
9514 #: ../source/TortoiseGit_en.xml:12507
\r
9516 msgid "Called after the user clicks <guibutton>OK</guibutton> in the commit dialog, and before the actual commit begins. This hook has a list of exactly what will be committed."
\r
9519 #: ../source/TortoiseGit_en.xml:12515
\r
9521 #: ../source/TortoiseGit_en.xml:12573
\r
9523 msgid "Post-commit"
\r
9526 #: ../source/TortoiseGit_en.xml:12517
\r
9528 msgid "Called after the commit finishes (whether successful or not)."
\r
9531 #: ../source/TortoiseGit_en.xml:12523
\r
9533 #: ../source/TortoiseGit_en.xml:12577
\r
9535 msgid "Start-update"
\r
9538 #: ../source/TortoiseGit_en.xml:12525
\r
9540 msgid "Called before the update-to-revision dialog is shown."
\r
9543 #: ../source/TortoiseGit_en.xml:12531
\r
9545 #: ../source/TortoiseGit_en.xml:12581
\r
9547 msgid "Pre-update"
\r
9550 #: ../source/TortoiseGit_en.xml:12533
\r
9552 msgid "Called before the actual Git update begins."
\r
9555 #: ../source/TortoiseGit_en.xml:12539
\r
9557 #: ../source/TortoiseGit_en.xml:12585
\r
9559 msgid "Post-update"
\r
9562 #: ../source/TortoiseGit_en.xml:12541
\r
9564 msgid "Called after the update finishes (whether successful or not)."
\r
9567 #: ../source/TortoiseGit_en.xml:12488
\r
9569 msgid "There are currently six types of hook script available <placeholder-1/>"
\r
9572 #: ../source/TortoiseGit_en.xml:12548
\r
9574 msgid "A hook is defined for a particular working copy path. You only need to specify the top level path; if you perform an operation in a sub-folder, TortoiseGit will automatically search upwards for a matching path."
\r
9577 #: ../source/TortoiseGit_en.xml:12553
\r
9579 msgid "Next you must specify the command line to execute, starting with the path to the hook script or executable. This could be a batch file, an executable file or any other file which has a valid windows file association, eg. a perl script."
\r
9582 #: ../source/TortoiseGit_en.xml:12559
\r
9584 msgid "The command line includes several parameters which get filled in by TortoiseGit. The parameters passed depend upon which hook is called. Each hook has its own parameters which are passed in the following order: <placeholder-1/>"
\r
9587 #: ../source/TortoiseGit_en.xml:12596
\r
9589 msgid "A path to a temporary file which contains all the paths for which the operation was started. Each path is on a separate line in the temp file."
\r
9592 #: ../source/TortoiseGit_en.xml:12606
\r
9594 msgid "The depth with which the commit/update is done."
\r
9597 #: ../source/TortoiseGit_en.xml:12616
\r
9599 msgid "svn_depth_unknown"
\r
9602 #: ../source/TortoiseGit_en.xml:12624
\r
9604 msgid "svn_depth_exclude"
\r
9607 #: ../source/TortoiseGit_en.xml:12632
\r
9609 msgid "svn_depth_empty"
\r
9612 #: ../source/TortoiseGit_en.xml:12640
\r
9614 msgid "svn_depth_files"
\r
9617 #: ../source/TortoiseGit_en.xml:12648
\r
9619 msgid "svn_depth_immediates"
\r
9622 #: ../source/TortoiseGit_en.xml:12656
\r
9624 msgid "svn_depth_infinity"
\r
9627 #: ../source/TortoiseGit_en.xml:12609
\r
9629 msgid "Possible values are: <placeholder-1/>"
\r
9632 #: ../source/TortoiseGit_en.xml:12667
\r
9634 msgid "Path to a file containing the log message for the commit. The file contains the text in UTF-8 encoding. After successful execution of the start-commit hook, the log message is read back, giving the hook a chance to modify it."
\r
9637 #: ../source/TortoiseGit_en.xml:12679
\r
9639 msgid "The repository revision to which the update should be done or after a commit completes."
\r
9642 #: ../source/TortoiseGit_en.xml:12688
\r
9644 msgid "Path to a file containing the error message. If there was no error, the file will be empty."
\r
9647 #: ../source/TortoiseGit_en.xml:12697
\r
9649 msgid "The current working directory with which the script is run. This is set to the common root directory of all affected paths."
\r
9652 #: ../source/TortoiseGit_en.xml:12590
\r
9654 msgid "The meaning of each of these parameters is described here: <placeholder-1/>"
\r
9657 #: ../source/TortoiseGit_en.xml:12705
\r
9659 msgid "Note that although we have given these parameters names for convenience, you do not have to refer to those names in the hook settings. All parameters listed for a particular hook are always passed, whether you want them or not ;-)"
\r
9662 #: ../source/TortoiseGit_en.xml:12711
\r
9664 msgid "If you want the Git operation to hold off until the hook has completed, check <guilabel>Wait for the script to finish</guilabel>."
\r
9667 #: ../source/TortoiseGit_en.xml:12715
\r
9669 msgid "Normally you will want to hide ugly DOS boxes when the script runs, so <guilabel>Hide the script while running</guilabel> is checked by default."
\r
9672 #: ../source/TortoiseGit_en.xml:12719
\r
9674 msgid "Sample client hook scripts can be found in the <literal>contrib</literal> folder in the <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/hook-scripts\"><citetitle>TortoiseGit repository</citetitle></ulink>. (<xref linkend=\"tsvn-preface-source\"/> explains how to access the repository)."
\r
9677 #: ../source/TortoiseGit_en.xml:12727
\r
9679 msgid "Issue Tracker Integration"
\r
9682 #: ../source/TortoiseGit_en.xml:12730
\r
9684 msgid "TortoiseGit can use a COM plugin to query issue trackers when in the commit dialog. The use of such plugins is described in <xref linkend=\"tsvn-dug-bugtracker-ref\"/>. If your system administrator has provided you with a plugin, which you have already installed and registered, this is the place to specify how it integrates with your working copy."
\r
9687 #: ../source/TortoiseGit_en.xml:12740
\r
9689 msgid "The Settings Dialog, Issue Tracker Integration Page"
\r
9692 #: ../source/TortoiseGit_en.xml:12738
\r
9694 msgid "<placeholder-1/> Click on <guibutton>Add...</guibutton> to use the plugin with a particular working copy. Here you can specify the working copy path, choose which plugin to use from a drop down list of all registered issue tracker plugins, and any parameters to pass. The parameters will be specific to the plugin, but might include your user name on the issue tracker so that the plugin can query for issues which are assigned to you."
\r
9697 #: ../source/TortoiseGit_en.xml:12760
\r
9699 msgid "This property specifies the COM UUID of the IBugTraqProvider, for example <literal>{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}</literal>."
\r
9702 #: ../source/TortoiseGit_en.xml:12769
\r
9704 msgid "This property specifies the parameters passed to the IBugTraqProvider."
\r
9707 #: ../source/TortoiseGit_en.xml:12751
\r
9709 msgid "If you want all users to use the same COM plugin for your project, you can specify the plugin also with the properties <literal>bugtraq:provideruuid</literal> and <literal>bugtraq:providerparams</literal>. <placeholder-1/> Please check the documentation of your IBugTraqProvider plugin to find out what to specify in these two properties."
\r
9712 #: ../source/TortoiseGit_en.xml:12782
\r
9714 msgid "TortoiseBlame Settings"
\r
9717 #: ../source/TortoiseGit_en.xml:12785
\r
9719 msgid "The Settings Dialog, TortoiseBlame Page"
\r
9722 #: ../source/TortoiseGit_en.xml:12783
\r
9724 msgid "<placeholder-1/> The settings used by TortoiseBlame are controlled from the main context menu, not directly with TortoiseBlame itself."
\r
9727 #: ../source/TortoiseGit_en.xml:12793
\r
9732 #: ../source/TortoiseGit_en.xml:12795
\r
9734 msgid "TortoiseBlame can use the background colour to indicate the age of lines in a file. You set the endpoints by specifying the colours for the newest and oldest revisions, and TortoiseBlame uses a linear interpolation between these colours according to the repository revision indicated for each line."
\r
9737 #: ../source/TortoiseGit_en.xml:12805
\r
9742 #: ../source/TortoiseGit_en.xml:12807
\r
9744 msgid "You can select the font used to display the text, and the point size to use. This applies both to the file content, and to the author and revision information shown in the left pane."
\r
9747 #: ../source/TortoiseGit_en.xml:12815
\r
9752 #: ../source/TortoiseGit_en.xml:12817
\r
9754 msgid "Defines how many spaces to use for expansion when a tab character is found in the file content."
\r
9757 #: ../source/TortoiseGit_en.xml:12826
\r
9759 msgid "Registry Settings"
\r
9762 #: ../source/TortoiseGit_en.xml:12828
\r
9767 #: ../source/TortoiseGit_en.xml:12830
\r
9769 msgid "A few infrequently used settings are available only by editing the registry directly. It goes without saying that you should only edit registry values if you know what you are doing."
\r
9772 #: ../source/TortoiseGit_en.xml:12839
\r
9774 msgid "You can specify a different location for the Git configuration file using registry location <literal>HKCU\\Software\\TortoiseGit\\ConfigDir</literal>. This will affect all TortoiseGit operations."
\r
9777 #: ../source/TortoiseGit_en.xml:12848
\r
9779 msgid "Cache tray icon"
\r
9782 #: ../source/TortoiseGit_en.xml:12850
\r
9784 msgid "To add a cache tray icon for the TSVNCache program, create a <literal>DWORD</literal> key with a value of 1 at <literal>HKCU\\Software\\TortoiseGit\\CacheTrayIcon</literal>. This is really only useful for developers as it allows you to terminate the program gracefully."
\r
9787 #: ../source/TortoiseGit_en.xml:12860
\r
9792 #: ../source/TortoiseGit_en.xml:12862
\r
9794 msgid "To show the command line parameters passed from the shell extension to TortoiseProc.exe create a <literal>DWORD</literal> key with a value of 1 at <literal>HKCU\\Software\\TortoiseGit\\Debug</literal>."
\r
9797 #: ../source/TortoiseGit_en.xml:12871
\r
9799 msgid "Owner-Drawn Menus"
\r
9802 #: ../source/TortoiseGit_en.xml:12873
\r
9804 msgid "This can be useful if you use something other than the windows explorer or if you get problems with the context menu displaying correctly. create a <literal>DWORD</literal> key with a value of 0 at <literal>HKCU\\Software\\TortoiseGit\\OwnerdrawnMenus</literal> if you don't want TortoiseGit to use owner-draw menu items in the shell context menu. Set this value to 2 if you don't want TortoiseGit to use icons in the context menu at all."
\r
9807 #: ../source/TortoiseGit_en.xml:12885
\r
9809 msgid "Block Overlay Status"
\r
9812 #: ../source/TortoiseGit_en.xml:12887
\r
9814 msgid "If you don't want the explorer to update the status overlays while another TortoiseGit command is running (e.g. Update, Commit, ...) then create a <literal>DWORD</literal> key with a value of 1 at <literal>HKCU\\Software\\TortoiseGit\\BlockStatus</literal>."
\r
9817 #: ../source/TortoiseGit_en.xml:12896
\r
9819 msgid "Update Check URL"
\r
9822 #: ../source/TortoiseGit_en.xml:12898
\r
9824 msgid "<literal>HKCU\\Software\\TortoiseGit\\UpdateCheckURL</literal> contains the URL from which TortoiseGit tries to download a text file to find out if there are updates available. You can also set this under <literal>HKLM</literal> instead of <literal>HKCU</literal> if you want, but <literal>HKCU</literal> overwrites the setting in <literal>HKLM</literal>. This might be useful for company admins who don't want their users to update TortoiseGit until they approve it."
\r
9827 #: ../source/TortoiseGit_en.xml:12910
\r
9829 msgid "Filenames without extensions in auto-completion list"
\r
9832 #: ../source/TortoiseGit_en.xml:12912
\r
9834 msgid "The auto-completion list shown in the commit message editor displays the names of files listed for commit. To also include these names with extensions removed, create a <literal>DWORD</literal> key with a value of 1 at <literal>HKCU\\Software\\TortoiseGit\\AutocompleteRemovesExtensions</literal>."
\r
9837 #: ../source/TortoiseGit_en.xml:12922
\r
9839 msgid "Explorer columns everywhere"
\r
9842 #: ../source/TortoiseGit_en.xml:12924
\r
9844 msgid "The extra columns the TortoiseGit adds to the details view in Windows Explorer are normally only active in a working copy. If you want those to be accessible everywhere, not just in working copies, create a <literal>DWORD</literal> key with a value of 1 at <literal>HKCU\\Software\\TortoiseGit\\ColumnsEveryWhere</literal>."
\r
9847 #: ../source/TortoiseGit_en.xml:12935
\r
9849 msgid "Merge log separator"
\r
9852 #: ../source/TortoiseGit_en.xml:12937
\r
9854 msgid "When you merge revisions from another branch, and merge tracking information is available, the log messages from the revisions you merge will be collected to make up a commit log message. A pre-defined string is used to separate the individual log messages of the merged revisions. If you prefer, you can create a <literal>SZ</literal> key at <literal>HKCU\\Software\\TortoiseGit\\MergeLogSeparator</literal> containing a separator string of your choice."
\r
9857 #: ../source/TortoiseGit_en.xml:12950
\r
9859 msgid "Always blame changes with TortoiseMerge"
\r
9862 #: ../source/TortoiseGit_en.xml:12952
\r
9864 msgid "TortoiseGit allows you to assign external diff viewer. Most such viewers, however, are not suited for change blaming (<xref linkend=\"tsvn-dug-blame-diffs\"/>), so you might wish to fall back to TortoiseMerge in this case. To do so, create a <literal>DWORD</literal> key with a value of 1 at <literal>HKCU\\Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge</literal>."
\r
9867 #: ../source/TortoiseGit_en.xml:12963
\r
9869 msgid "Current revision highlighting for folders in log dialog"
\r
9872 #: ../source/TortoiseGit_en.xml:12965
\r
9874 msgid "The log dialog highlights the current working copy revision when the log is shown for a file. To do the same thing for a folder requires a working copy crawl, which can be a slow operation for large working copies. If you want to enable this feature you must create a <literal>DWORD</literal> registry key with value 1 at <literal>HKCU\\Software\\TortoiseGit\\RecursiveLogRev</literal>."
\r
9877 #: ../source/TortoiseGit_en.xml:12977
\r
9879 msgid "Make checkout fail if an item of the same name exists"
\r
9882 #: ../source/TortoiseGit_en.xml:12979
\r
9884 msgid "By default, if you checkout a working copy over an existing unversioned folder structure, as you might do after import, then any existing which differ from the repository content will be left unchanged and marked as modified. When you come to commit, it is your local copy which will then be sent back to the repository. Some people would prefer the checkout to fail if the existing content differs, so that if two people add the same file the second person's version does not overwrite the original version by mistake. If you want to force checkouts to fail in this instance you must create a <literal>DWORD</literal> registry key with value 0 at <literal>HKCU\\Software\\TortoiseGit\\AllowUnversionedObstruction</literal>."
\r
9887 #: ../source/TortoiseGit_en.xml:12998
\r
9889 msgid "Git Working Folders"
\r
9892 #: ../source/TortoiseGit_en.xml:13000
\r
9894 msgid ".svn folder"
\r
9897 #: ../source/TortoiseGit_en.xml:13003
\r
9899 msgid "_svn folder"
\r
9902 #: ../source/TortoiseGit_en.xml:13005
\r
9904 msgid "VS.NET 2003 when used with web projects can't handle the <literal>.svn</literal> folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses."
\r
9907 #: ../source/TortoiseGit_en.xml:13012
\r
9909 msgid "Note that the bug is fixed in VS2005 and later versions."
\r
9912 #: ../source/TortoiseGit_en.xml:13016
\r
9914 msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable <literal>SVN_ASP_DOT_NET_HACK</literal>. If that variable is set, then Git will use <literal>_svn</literal> folders instead of <literal>.svn</literal> folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to <xref linkend=\"tsvn-dug-settings-main\"/>."
\r
9917 #: ../source/TortoiseGit_en.xml:13026
\r
9919 msgid "For more information, and other ways to avoid this problem in the first place, check out the article about this in our <ulink url=\"http://TortoiseGit.net/aspdotnethack\"><citetitle>FAQ</citetitle></ulink>."
\r
9922 #: ../source/TortoiseGit_en.xml:13036
\r
9924 msgid "Final Step"
\r
9927 #: ../source/TortoiseGit_en.xml:13042
\r
9932 #: ../source/TortoiseGit_en.xml:13043
\r
9934 msgid "Even though TortoiseGit and TortoiseMerge are free, you can support the developers by sending in patches and play an active role in the development. You can also help to cheer us up during the endless hours we spend in front of our computers."
\r
9937 #: ../source/TortoiseGit_en.xml:13049
\r
9939 msgid "While working on TortoiseGit we love to listen to music. And since we spend many hours on the project we need a <emphasis>lot</emphasis> of music. Therefore we have set up some wish-lists with our favourite music CDs and DVDs: <ulink url=\"http://TortoiseGit.tigris.org/donate.html\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink> Please also have a look at the list of people who contributed to the project by sending in patches or translations."
\r
9942 #: ../source/TortoiseGit_en.xml:13063
\r
9944 msgid "The SubWCRev Program"
\r
9947 #: ../source/TortoiseGit_en.xml:13066
\r
9949 msgid "version extraction"
\r
9952 #: ../source/TortoiseGit_en.xml:13069
\r
9957 #: ../source/TortoiseGit_en.xml:13072
\r
9962 #: ../source/TortoiseGit_en.xml:13075
\r
9964 msgid "version number in files"
\r
9967 #: ../source/TortoiseGit_en.xml:13077
\r
9969 msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an <quote>About</quote> box."
\r
9972 #: ../source/TortoiseGit_en.xml:13091
\r
9974 msgid "The SubWCRev Command Line"
\r
9977 #: ../source/TortoiseGit_en.xml:13092
\r
9979 msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout."
\r
9982 #: ../source/TortoiseGit_en.xml:13100
\r
9984 msgid "SubWCRev.exe is called from the command line or a script, and is controlled using the command line parameters. <screen>\nSubWCRev WorkingCopyPath [SrcVersionFile DstVersionFile] [-nmdfe]\n</screen>"
\r
9987 #: ../source/TortoiseGit_en.xml:13107
\r
9989 msgid "<literal>WorkingCopyPath</literal> is the path to the working copy being checked. You can only use SubWCRev on working copies, not directly on the repository. The path may be absolute or relative to the current working directory."
\r
9992 #: ../source/TortoiseGit_en.xml:13113
\r
9994 msgid "If you want SubWCRev to perform keyword substitution, so that fields like repository revision and URL are saved to a text file, you need to supply a template file <literal>SrcVersionFile</literal> and an output file <literal>DstVersionFile</literal> which contains the substituted version of the template."
\r
9997 #: ../source/TortoiseGit_en.xml:13129
\r
9999 #: ../source/TortoiseGit_en.xml:13214
\r
10001 msgid "List of available command line switches"
\r
10004 #: ../source/TortoiseGit_en.xml:13135
\r
10006 #: ../source/TortoiseGit_en.xml:14428
\r
10008 #: ../source/TortoiseGit_en.xml:15523
\r
10010 #: ../source/TortoiseGit_en.xml:16537
\r
10015 #: ../source/TortoiseGit_en.xml:13136
\r
10017 #: ../source/TortoiseGit_en.xml:13221
\r
10019 #: ../source/TortoiseGit_en.xml:13419
\r
10021 #: ../source/TortoiseGit_en.xml:14684
\r
10023 #: ../source/TortoiseGit_en.xml:15093
\r
10025 msgid "Description"
\r
10028 #: ../source/TortoiseGit_en.xml:13144
\r
10030 msgid "ERRORLEVEL 7"
\r
10033 #: ../source/TortoiseGit_en.xml:13142
\r
10035 msgid "If this switch is given, SubWCRev will exit with <placeholder-1/> if the working copy contains local modifications. This may be used to prevent building with uncommitted changes present."
\r
10038 #: ../source/TortoiseGit_en.xml:13153
\r
10040 msgid "ERRORLEVEL 8"
\r
10043 #: ../source/TortoiseGit_en.xml:13151
\r
10045 msgid "If this switch is given, SubWCRev will exit with <placeholder-1/> if the working copy contains mixed revisions. This may be used to prevent building with a partially updated working copy."
\r
10048 #: ../source/TortoiseGit_en.xml:13162
\r
10050 msgid "ERRORLEVEL 9"
\r
10053 #: ../source/TortoiseGit_en.xml:13160
\r
10055 msgid "If this switch is given, SubWCRev will exit with <placeholder-1/> if the destination file already exists."
\r
10058 #: ../source/TortoiseGit_en.xml:13168
\r
10060 msgid "If this switch is given, SubWCRev will include the last-changed revision of folders. The default behaviour is to use only files when getting the revision numbers."
\r
10063 #: ../source/TortoiseGit_en.xml:13180
\r
10065 msgid "svn:externals"
\r
10068 #: ../source/TortoiseGit_en.xml:13177
\r
10070 msgid "If this switch is given, SubWCRev will examine directories which are included with <placeholder-1/>, but only if they are from the same repository. The default behaviour is to ignore externals."
\r
10073 #: ../source/TortoiseGit_en.xml:13187
\r
10075 msgid "If this switch is given, SubWCRev will output the revision numbers in HEX."
\r
10078 #: ../source/TortoiseGit_en.xml:13194
\r
10080 msgid "If this switch is given, SubWCRev will output the revision numbers in HEX, with '0X' prepended."
\r
10083 #: ../source/TortoiseGit_en.xml:13122
\r
10085 msgid "There are a number of optional switches which affect the way SubWCRev works. If you use more than one, they must be specified as a single group, eg. <literal>-nm</literal>, not <literal>-n -m</literal>. <placeholder-1/>"
\r
10088 #: ../source/TortoiseGit_en.xml:13209
\r
10090 msgid "Keyword Substitution"
\r
10093 #: ../source/TortoiseGit_en.xml:13220
\r
10098 #: ../source/TortoiseGit_en.xml:13227
\r
10100 msgid "Replaced with the highest commit revision in the working copy."
\r
10103 #: ../source/TortoiseGit_en.xml:13238
\r
10105 msgid "yyyy-mm-dd hh:mm:ss"
\r
10108 #: ../source/TortoiseGit_en.xml:13240
\r
10110 msgid "strftime()"
\r
10113 #: ../source/TortoiseGit_en.xml:13242
\r
10115 msgid "$WCDATE=%a %b %d %I:%M:%S %p$"
\r
10118 #: ../source/TortoiseGit_en.xml:13245
\r
10120 msgid "online reference"
\r
10123 #: ../source/TortoiseGit_en.xml:13234
\r
10125 msgid "Replaced with the commit date/time of the highest commit revision. By default, international format is used: <placeholder-1/>. Alternatively, you can specify a custom format which will be used with <placeholder-2/>, for example: <placeholder-3/>. For a list of available formatting characters, look at the <ulink url=\"http://www.cppreference.com/stddate/strftime.html\"><placeholder-4/></ulink>."
\r
10128 #: ../source/TortoiseGit_en.xml:13255
\r
10130 #: ../source/TortoiseGit_en.xml:13323
\r
10132 #: ../source/TortoiseGit_en.xml:13449
\r
10137 #: ../source/TortoiseGit_en.xml:13251
\r
10139 msgid "Replaced with the current system date/time. This can be used to indicate the build time. Time formatting can be used as described for <placeholder-1/>."
\r
10142 #: ../source/TortoiseGit_en.xml:13260
\r
10144 msgid "Replaced with the update revision range in the working copy. If the working copy is in a consistent state, this will be a single revision. If the working copy contains mixed revisions, either due to being out of date, or due to a deliberate update-to-revision, then the range will be shown in the form 100:200"
\r
10147 #: ../source/TortoiseGit_en.xml:13273
\r
10149 msgid "$WCMIXED?TText:FText$"
\r
10152 #: ../source/TortoiseGit_en.xml:13274
\r
10154 #: ../source/TortoiseGit_en.xml:13282
\r
10156 #: ../source/TortoiseGit_en.xml:13297
\r
10158 #: ../source/TortoiseGit_en.xml:13305
\r
10160 #: ../source/TortoiseGit_en.xml:13314
\r
10165 #: ../source/TortoiseGit_en.xml:13275
\r
10167 #: ../source/TortoiseGit_en.xml:13283
\r
10169 #: ../source/TortoiseGit_en.xml:13298
\r
10171 #: ../source/TortoiseGit_en.xml:13307
\r
10173 #: ../source/TortoiseGit_en.xml:13315
\r
10178 #: ../source/TortoiseGit_en.xml:13272
\r
10180 msgid "<placeholder-1/> is replaced with <placeholder-2/> if there are mixed update revisions, or <placeholder-3/> if not."
\r
10183 #: ../source/TortoiseGit_en.xml:13281
\r
10185 msgid "$WCMODS?TText:FText$"
\r
10188 #: ../source/TortoiseGit_en.xml:13280
\r
10190 msgid "<placeholder-1/> is replaced with <placeholder-2/> if there are local modifications, or <placeholder-3/> if not."
\r
10193 #: ../source/TortoiseGit_en.xml:13288
\r
10195 msgid "Replaced with the repository URL of the working copy path passed to SubWCRev."
\r
10198 #: ../source/TortoiseGit_en.xml:13296
\r
10200 msgid "$WCINSVN?TText:FText$"
\r
10203 #: ../source/TortoiseGit_en.xml:13295
\r
10205 msgid "<placeholder-1/> is replaced with <placeholder-2/> if the entry is versioned, or <placeholder-3/> if not."
\r
10208 #: ../source/TortoiseGit_en.xml:13304
\r
10210 msgid "$WCNEEDSLOCK?TText:FText$"
\r
10213 #: ../source/TortoiseGit_en.xml:13306
\r
10215 #: ../source/TortoiseGit_en.xml:13488
\r
10217 msgid "svn:needs-lock"
\r
10220 #: ../source/TortoiseGit_en.xml:13303
\r
10222 msgid "<placeholder-1/> is replaced with <placeholder-2/> if the entry has the <placeholder-3/> property set, or <placeholder-4/> if not."
\r
10225 #: ../source/TortoiseGit_en.xml:13313
\r
10227 msgid "$WCISLOCKED?TText:FText$"
\r
10230 #: ../source/TortoiseGit_en.xml:13312
\r
10232 msgid "<placeholder-1/> is replaced with <placeholder-2/> if the entry is locked, or <placeholder-3/> if not."
\r
10235 #: ../source/TortoiseGit_en.xml:13320
\r
10237 msgid "Replaced with the lock date. Time formatting can be used as described for <placeholder-1/>."
\r
10240 #: ../source/TortoiseGit_en.xml:13328
\r
10242 msgid "Replaced with the name of the lock owner."
\r
10245 #: ../source/TortoiseGit_en.xml:13334
\r
10247 msgid "Replaced with the comment of the lock."
\r
10250 #: ../source/TortoiseGit_en.xml:13210
\r
10252 msgid "If a source and destination files are supplied, SubWCRev copies source to destination, performing keyword substitution as follows: <placeholder-1/>"
\r
10255 #: ../source/TortoiseGit_en.xml:13347
\r
10257 msgid "Keyword Example"
\r
10260 #: ../source/TortoiseGit_en.xml:13348
\r
10262 msgid "The example below shows how keywords in a template file are substituted in the output file."
\r
10265 #: ../source/TortoiseGit_en.xml:13352
\r
10266 #.(programlisting)
\r
10268 msgid "\n// Test file for SubWCRev: testfile.tmpl\n\nchar *Revision = \"$WCREV$\";\nchar *Modified = \"$WCMODS?Modified:Not modified$\";\nchar *Date = \"$WCDATE$\";\nchar *Range = \"$WCRANGE$\";\nchar *Mixed = \"$WCMIXED?Mixed revision WC:Not mixed$\";\nchar *URL = \"$WCURL$\";\n\n#if $WCMODS?1:0$\n#error Source is modified\n#endif\n\n// End of file\n"
\r
10271 #: ../source/TortoiseGit_en.xml:13368
\r
10273 msgid "After running <literal>SubWCRev.exe path\\to\\workingcopy testfile.tmpl testfile.txt</literal>, the output file <literal>testfile.txt</literal> would looks like this:"
\r
10276 #: ../source/TortoiseGit_en.xml:13372
\r
10277 #.(programlisting)
\r
10279 msgid "\n// Test file for SubWCRev: testfile.txt\n\nchar *Revision = \"3701\";\nchar *Modified = \"Modified\";\nchar *Date = \"2005/06/15 11:15:12\";\nchar *Range = \"3699:3701\";\nchar *Mixed = \"Mixed revision WC\";\nchar *URL = \"http://project.domain.org/svn/trunk/src\";\n\n#if 1\n#error Source is modified\n#endif\n\n// End of file\n"
\r
10282 #: ../source/TortoiseGit_en.xml:13389
\r
10284 msgid "A file like this will be included in the build so you would expect it to be versioned. Be sure to version the template file, not the generated file, otherwise each time you regenerate the version file you need to commit the change, which in turn means the version file needs to be updated."
\r
10287 #: ../source/TortoiseGit_en.xml:13402
\r
10289 msgid "COM interface"
\r
10292 #: ../source/TortoiseGit_en.xml:13404
\r
10294 msgid "COM SubWCRev interface"
\r
10297 #: ../source/TortoiseGit_en.xml:13412
\r
10299 msgid "COM/automation methods supported"
\r
10302 #: ../source/TortoiseGit_en.xml:13418
\r
10307 #: ../source/TortoiseGit_en.xml:13431
\r
10312 #: ../source/TortoiseGit_en.xml:13434
\r
10317 #: ../source/TortoiseGit_en.xml:13425
\r
10319 msgid "This method traverses the working copy gathering the revision information. Naturally you must call this before you can access the information using the remaining methods. The first parameter is the path. The second parameter should be true if you want to include folder revisions. Equivalent to the <placeholder-1/> command line switch. The third parameter should be true if you want to include svn:externals. Equivalent to the <placeholder-2/> command line switch."
\r
10322 #: ../source/TortoiseGit_en.xml:13442
\r
10327 #: ../source/TortoiseGit_en.xml:13440
\r
10329 msgid "The highest commit revision in the working copy. Equivalent to <placeholder-1/>"
\r
10332 #: ../source/TortoiseGit_en.xml:13447
\r
10334 msgid "The commit date/time of the highest commit revision. Equivalent to <placeholder-1/>"
\r
10337 #: ../source/TortoiseGit_en.xml:13454
\r
10339 msgid "The author of the highest commit revision, that is, the last person to commit changes to the working copy."
\r
10342 #: ../source/TortoiseGit_en.xml:13461
\r
10344 #: ../source/TortoiseGit_en.xml:13465
\r
10346 msgid "$WCRANGE$"
\r
10349 #: ../source/TortoiseGit_en.xml:13461
\r
10351 msgid "The minimum update revision, as shown in <placeholder-1/>"
\r
10354 #: ../source/TortoiseGit_en.xml:13465
\r
10356 msgid "The maximum update revision, as shown in <placeholder-1/>"
\r
10359 #: ../source/TortoiseGit_en.xml:13469
\r
10361 msgid "True if there are local modifications"
\r
10364 #: ../source/TortoiseGit_en.xml:13475
\r
10366 msgid "GetWCInfo"
\r
10369 #: ../source/TortoiseGit_en.xml:13476
\r
10374 #: ../source/TortoiseGit_en.xml:13473
\r
10376 msgid "Replaced with the repository URL of the working copy path used in <placeholder-1/>. Equivalent to <placeholder-2/>"
\r
10379 #: ../source/TortoiseGit_en.xml:13481
\r
10381 msgid "True if the item is versioned."
\r
10384 #: ../source/TortoiseGit_en.xml:13487
\r
10386 msgid "True if the item has the <placeholder-1/> property set."
\r
10389 #: ../source/TortoiseGit_en.xml:13494
\r
10391 msgid "True if the item is locked."
\r
10394 #: ../source/TortoiseGit_en.xml:13500
\r
10396 msgid "String representing the date when the lock was created, or an empty string if the item is not locked."
\r
10399 #: ../source/TortoiseGit_en.xml:13507
\r
10401 msgid "String representing the lock owner, or an empty string if the item is not locked."
\r
10404 #: ../source/TortoiseGit_en.xml:13514
\r
10406 msgid "The message entered when the lock was created."
\r
10409 #: ../source/TortoiseGit_en.xml:13406
\r
10411 msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is <literal>SubWCRev.object</literal>, and the following methods are supported: <placeholder-1/>"
\r
10414 #: ../source/TortoiseGit_en.xml:13524
\r
10415 #.(programlisting)
\r
10417 msgid "\n// testCOM.js - javascript file\n// test script for the SubWCRev COM/Automation-object\n\nfilesystem = new ActiveXObject(\"Scripting.FileSystemObject\");\n\nrevObject1 = new ActiveXObject(\"SubWCRev.object\");\nrevObject2 = new ActiveXObject(\"SubWCRev.object\");\nrevObject3 = new ActiveXObject(\"SubWCRev.object\");\nrevObject4 = new ActiveXObject(\"SubWCRev.object\");\n\nrevObject1.GetWCInfo(\n filesystem.GetAbsolutePathName(\".\"), 1, 1);\nrevObject2.GetWCInfo(\n filesystem.GetAbsolutePathName(\"..\"), 1, 1);\nrevObject3.GetWCInfo(\n filesystem.GetAbsolutePathName(\"SubWCRev.cpp\"), 1, 1);\nrevObject4.GetWCInfo(\n filesystem.GetAbsolutePathName(\"..\\\\..\"), 1, 1);\n\nwcInfoString1 = \"Revision = \" + revObject1.Revision + \n\t\t\t\t\"\\nMin Revision = \" + revObject1.MinRev + \n\t\t\t\t\"\\nMax Revision = \" + revObject1.MaxRev + \n\t\t\t\t\"\\nDate = \" + revObject1.Date + \n\t\t\t\t\"\\nURL = \" + revObject1.Url + \"\\nAuthor = \" + \n\t\t\t\trevObject1.Author + \"\\nHasMods = \" + \n\t\t\t\trevObject1.HasModifications + \"\\nIsSvnItem = \" + \n\t\t\t\trevObject1.IsSvnItem + \"\\nNeedsLocking = \" + \n\t\t\t\trevObject1.NeedsLocking + \"\\nIsLocked = \" + \n\t\t\t\trevObject1.IsLocked + \"\\nLockCreationDate = \" + \n\t\t\t\trevObject1.LockCreationDate + \"\\nLockOwner = \" + \n\t\t\t\trevObject1.LockOwner + \"\\nLockComment = \" + \n\t\t\t\trevObject1.LockComment;\nwcInfoString2 = \"Revision = \" + revObject2.Revision + \n\t\t\t\t\"\\nMin Revision = \" + revObject2.MinRev + \n\t\t\t\t\"\\nMax Revision = \" + revObject2.MaxRev + \n\t\t\t\t\"\\nDate = \" + revObject2.Date + \n\t\t\t\t\"\\nURL = \" + revObject2.Url + \"\\nAuthor = \" + \n\t\t\t\trevObject2.Author + \"\\nHasMods = \" + \n\t\t\t\trevObject2.HasModifications + \"\\nIsSvnItem = \" + \n\t\t\t\trevObject2.IsSvnItem + \"\\nNeedsLocking = \" + \n\t\t\t\trevObject2.NeedsLocking + \"\\nIsLocked = \" + \n\t\t\t\trevObject2.IsLocked + \"\\nLockCreationDate = \" + \n\t\t\t\trevObject2.LockCreationDate + \"\\nLockOwner = \" + \n\t\t\t\trevObject2.LockOwner + \"\\nLockComment = \" + \n\t\t\t\trevObject2.LockComment;\nwcInfoString3 = \"Revision = \" + revObject3.Revision + \n\t\t\t\t\"\\nMin Revision = \" + revObject3.MinRev + \n\t\t\t\t\"\\nMax Revision = \" + revObject3.MaxRev + \n\t\t\t\t\"\\nDate = \" + revObject3.Date + \n\t\t\t\t\"\\nURL = \" + revObject3.Url + \"\\nAuthor = \" + \n\t\t\t\trevObject3.Author + \"\\nHasMods = \" + \n\t\t\t\trevObject3.HasModifications + \"\\nIsSvnItem = \" + \n\t\t\t\trevObject3.IsSvnItem + \"\\nNeedsLocking = \" + \n\t\t\t\trevObject3.NeedsLocking + \"\\nIsLocked = \" + \n\t\t\t\trevObject3.IsLocked + \"\\nLockCreationDate = \" + \n\t\t\t\trevObject3.LockCreationDate + \"\\nLockOwner = \" + \n\t\t\t\trevObject3.LockOwner + \"\\nLockComment = \" + \n\t\t\t\trevObject3.LockComment;\nwcInfoString4 = \"Revision = \" + revObject4.Revision + \n\t\t\t\t\"\\nMin Revision = \" + revObject4.MinRev + \n\t\t\t\t\"\\nMax Revision = \" + revObject4.MaxRev + \n\t\t\t\t\"\\nDate = \" + revObject4.Date + \n\t\t\t\t\"\\nURL = \" + revObject4.Url + \"\\nAuthor = \" + \n\t\t\t\trevObject4.Author + \"\\nHasMods = \" + \n\t\t\t\trevObject4.HasModifications + \"\\nIsSvnItem = \" + \n\t\t\t\trevObject4.IsSvnItem + \"\\nNeedsLocking = \" + \n\t\t\t\trevObject4.NeedsLocking + \"\\nIsLocked = \" + \n\t\t\t\trevObject4.IsLocked + \"\\nLockCreationDate = \" + \n\t\t\t\trevObject4.LockCreationDate + \"\\nLockOwner = \" + \n\t\t\t\trevObject4.LockOwner + \"\\nLockComment = \" + \n\t\t\t\trevObject4.LockComment;\n\nWScript.Echo(wcInfoString1);\nWScript.Echo(wcInfoString2);\nWScript.Echo(wcInfoString3);\nWScript.Echo(wcInfoString4);\n\n"
\r
10420 #: ../source/TortoiseGit_en.xml:13522
\r
10422 msgid "The following example shows how the interface might be used. <placeholder-1/>"
\r
10425 #: ../source/TortoiseGit_en.xml:13607
\r
10427 msgid "Frequently Asked Questions (FAQ)"
\r
10430 #: ../source/TortoiseGit_en.xml:13610
\r
10435 #: ../source/TortoiseGit_en.xml:13612
\r
10437 msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an <ulink url=\"http://TortoiseGit.tigris.org/faq.html\"><citetitle>online FAQ</citetitle></ulink> which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists <email>tortoisegit-dev@googlegroups.com </email> and <email>tortoisegit-users@googlegroups.com </email>."
\r
10440 #: ../source/TortoiseGit_en.xml:13624
\r
10442 msgid "We also maintain a project <ulink url=\"http://issues.TortoiseGit.net\"><citetitle>Issue Tracker</citetitle></ulink> which tells you about some of the things we have on our To-Do list, and bugs which have already been fixed. If you think you have found a bug, or want to request a new feature, check here first to see if someone else got there before you."
\r
10445 #: ../source/TortoiseGit_en.xml:13634
\r
10447 msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. <email>tortoisegit-users@googlegroups.com </email> is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on <email>tortoisegit-dev@googlegroups.com </email>."
\r
10450 #: ../source/TortoiseGit_en.xml:13650
\r
10452 msgid "How Do I..."
\r
10455 #: ../source/TortoiseGit_en.xml:13652
\r
10457 msgid "This appendix contains solutions to problems/questions you might have when using TortoiseGit."
\r
10460 #: ../source/TortoiseGit_en.xml:13658
\r
10462 msgid "Move/copy a lot of files at once"
\r
10465 #: ../source/TortoiseGit_en.xml:13660
\r
10470 #: ../source/TortoiseGit_en.xml:13666
\r
10472 msgid "reorganize"
\r
10475 #: ../source/TortoiseGit_en.xml:13668
\r
10477 msgid "Moving/Copying single files can be done by using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Rename...</guimenuitem></menuchoice>. But if you want to move/copy a lot of files, this way is just too slow and too much work."
\r
10480 #: ../source/TortoiseGit_en.xml:13677
\r
10482 msgid "The recommended way is by <action>right-dragging</action> the files to the new location. Simply <action>right-click</action> on the files you want to move/copy without releasing the mouse button. Then drag the files to the new location and release the mouse button. A context menu will appear where you can either choose <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Copy versioned files here</guimenuitem></menuchoice>. or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Move versioned files here</guimenuitem></menuchoice>."
\r
10485 #: ../source/TortoiseGit_en.xml:13705
\r
10487 msgid "Force users to enter a log message"
\r
10490 #: ../source/TortoiseGit_en.xml:13707
\r
10492 msgid "log message"
\r
10495 #: ../source/TortoiseGit_en.xml:13710
\r
10497 msgid "commit message"
\r
10500 #: ../source/TortoiseGit_en.xml:13713
\r
10502 msgid "empty message"
\r
10505 #: ../source/TortoiseGit_en.xml:13715
\r
10507 msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly."
\r
10510 #: ../source/TortoiseGit_en.xml:13721
\r
10512 msgid "Hook-script on the server"
\r
10515 #: ../source/TortoiseGit_en.xml:13722
\r
10517 msgid "If you have direct access to the repository server, you can install a pre-commit hook script which rejects all commits with an empty or too short log message."
\r
10520 #: ../source/TortoiseGit_en.xml:13727
\r
10522 msgid "In the repository folder on the server, there's a sub-folder <filename>hooks</filename> which contains some example hook scripts you can use. The file <filename>pre-commit.tmpl</filename> contains a sample script which will reject commits if no log message is supplied, or the message is too short. The file also contains comments on how to install/use this script. Just follow the instructions in that file."
\r
10525 #: ../source/TortoiseGit_en.xml:13737
\r
10527 msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the <guibutton>OK</guibutton> button disabled until the log message is long enough then please use the method described below."
\r
10530 #: ../source/TortoiseGit_en.xml:13748
\r
10532 msgid "Project properties"
\r
10535 #: ../source/TortoiseGit_en.xml:13749
\r
10537 msgid "TortoiseGit uses properties to control some of its features. One of those properties is the <literal>tsvn:logminsize</literal> property."
\r
10540 #: ../source/TortoiseGit_en.xml:13753
\r
10542 msgid "If you set that property on a folder, then TortoiseGit will disable the <guibutton>OK</guibutton> button in all commit dialogs until the user has entered a log message with at least the length specified in the property."
\r
10545 #: ../source/TortoiseGit_en.xml:13758
\r
10547 msgid "For detailed information on those project properties, please refer to <xref linkend=\"tsvn-dug-propertypage\"/>"
\r
10550 #: ../source/TortoiseGit_en.xml:13765
\r
10552 msgid "Update selected files from the repository"
\r
10555 #: ../source/TortoiseGit_en.xml:13769
\r
10557 msgid "Normally you update your working copy using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update</guimenuitem></menuchoice>. But if you only want to pick up some new files that a colleague has added without merging in any changes to other files at the same time, you need a different approach."
\r
10560 #: ../source/TortoiseGit_en.xml:13779
\r
10562 msgid "Use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Check for Modifications</guimenuitem></menuchoice>. and click on <guibutton>Check repository</guibutton> to see what has changed in the repository. Select the files you want to update locally, then use the context menu to update just those files."
\r
10565 #: ../source/TortoiseGit_en.xml:13791
\r
10567 msgid "Roll back (Undo) revisions in the repository"
\r
10570 #: ../source/TortoiseGit_en.xml:13793
\r
10575 #: ../source/TortoiseGit_en.xml:13799
\r
10577 msgid "undo commit"
\r
10580 #: ../source/TortoiseGit_en.xml:13802
\r
10582 msgid "undo change"
\r
10585 #: ../source/TortoiseGit_en.xml:13805
\r
10587 msgid "Use the revision log dialog"
\r
10590 #: ../source/TortoiseGit_en.xml:13806
\r
10592 msgid "The easiest way to revert the changes from a single revision, or from a range of revisions, is to use the revision log dialog. This is also the method to use of you want to discard recent changes and make an earlier revision the new HEAD."
\r
10595 #: ../source/TortoiseGit_en.xml:13815
\r
10597 msgid "Select the file or folder in which you need to revert the changes. If you want to revert all changes, this should be the top level folder."
\r
10600 #: ../source/TortoiseGit_en.xml:13822
\r
10602 msgid "Select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Show Log</guimenuitem></menuchoice> to display a list of revisions. You may need to use <guibutton>Show All</guibutton> or <guibutton>Next 100</guibutton> to show the revision(s) you are interested in."
\r
10605 #: ../source/TortoiseGit_en.xml:13835
\r
10607 msgid "Select the revision you wish to revert. If you want to undo a range of revisions, select the first one and hold the <keycap>Shift</keycap> key while selecting the last one. Note that for multiple revisions, the range must be unbroken with no gaps. <action>Right click</action> on the selected revision(s), then select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Revert changes from this revision</guimenuitem></menuchoice>."
\r
10610 #: ../source/TortoiseGit_en.xml:13850
\r
10612 msgid "Or if you want to make an earlier revision the new HEAD revision, <action>right click</action> on the selected revision, then select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Revert to this revision</guimenuitem></menuchoice>. This will discard <emphasis>all</emphasis> changes after the selected revision."
\r
10615 #: ../source/TortoiseGit_en.xml:13863
\r
10617 #: ../source/TortoiseGit_en.xml:13920
\r
10619 msgid "You have reverted the changes within your working copy. Check the results, then commit the changes."
\r
10622 #: ../source/TortoiseGit_en.xml:13869
\r
10624 msgid "Use the merge dialog"
\r
10627 #: ../source/TortoiseGit_en.xml:13870
\r
10629 msgid "To undo a larger range of revisions, you can use the Merge dialog. The previous method uses merging behind the scenes; this method uses it explicitly."
\r
10632 #: ../source/TortoiseGit_en.xml:13877
\r
10634 msgid "In your working copy select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Merge</guimenuitem></menuchoice>."
\r
10637 #: ../source/TortoiseGit_en.xml:13886
\r
10639 msgid "In the <guilabel>From:</guilabel> field enter the full folder URL of the branch or tag containing the changes you want to revert in your working copy. This should come up as the default URL."
\r
10642 #: ../source/TortoiseGit_en.xml:13894
\r
10644 msgid "In the <guilabel>From Revision</guilabel> field enter the revision number that you are currently at. If you are sure there is no-one else making changes, you can use the HEAD revision."
\r
10647 #: ../source/TortoiseGit_en.xml:13902
\r
10649 msgid "make sure the <guilabel>Use \"From:\" URL</guilabel> checkbox is checked."
\r
10652 #: ../source/TortoiseGit_en.xml:13908
\r
10654 msgid "In the <guilabel>To Revision</guilabel> field enter the revision number that you want to revert to, namely the one <emphasis>before</emphasis> the first revision to be reverted."
\r
10657 #: ../source/TortoiseGit_en.xml:13915
\r
10659 msgid "Click <guibutton>OK</guibutton> to complete the merge."
\r
10662 #: ../source/TortoiseGit_en.xml:13926
\r
10664 msgid "Use <literal>svndumpfilter</literal>"
\r
10667 #: ../source/TortoiseGit_en.xml:13927
\r
10669 msgid "Since TortoiseGit never loses data, your <quote>rolled back</quote> revisions still exist as intermediate revisions in the repository. Only the HEAD revision was changed to a previous state. If you want to make revisions disappear completely from your repository, erasing all trace that they ever existed, you have to use more extreme measures. Unless there is a really good reason to do this, it is <emphasis>not recommended</emphasis>. One possible reason would be that someone committed a confidential document to a public repository."
\r
10672 #: ../source/TortoiseGit_en.xml:13938
\r
10674 msgid "The only way to remove data from the repository is to use the Git command line tool <literal>svnadmin</literal>. You can find a description of how this works in the <ulink url=\"http://svnbook.red-bean.com/en/1.5/svn.reposadmin.maint.html\"><citetitle>Repository Maintenance</citetitle></ulink>."
\r
10677 #: ../source/TortoiseGit_en.xml:13949
\r
10679 msgid "Compare two revisions of a file or folder"
\r
10682 #: ../source/TortoiseGit_en.xml:13951
\r
10684 msgid "compare files"
\r
10687 #: ../source/TortoiseGit_en.xml:13954
\r
10689 msgid "compare folders"
\r
10692 #: ../source/TortoiseGit_en.xml:13957
\r
10697 #: ../source/TortoiseGit_en.xml:13959
\r
10699 msgid "If you want to compare two revisions in an item's history, for example revisions 100 and 200 of the same file, just use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Show Log</guimenuitem></menuchoice> to list the revision history for that file. Pick the two revisions you want to compare then use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Compare Revisions</guimenuitem></menuchoice>."
\r
10702 #: ../source/TortoiseGit_en.xml:13973
\r
10704 msgid "If you want to compare the same item in two different trees, for example the trunk and a branch, you can use the repository browser to open up both trees, select the file in both places, then use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Compare Revisions</guimenuitem></menuchoice>."
\r
10707 #: ../source/TortoiseGit_en.xml:13983
\r
10709 msgid "If you want to compare two trees to see what has changed, for example the trunk and a tagged release, you can use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revision Graph</guimenuitem></menuchoice> Select the two nodes to compare, then use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Compare HEAD Revisions</guimenuitem></menuchoice>. This will show a list of changed files, and you can then select individual files to view the changes in detail. You can also export a tree structure containing all the changed files, or simply a list of all changed files. Read <xref linkend=\"tsvn-dug-compare-revs\"/> for more information. Alternatively use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Unified Diff of HEAD Revisions</guimenuitem></menuchoice> to see a summary of all differences, with minimal context."
\r
10712 #: ../source/TortoiseGit_en.xml:14009
\r
10714 msgid "Include a common sub-project"
\r
10717 #: ../source/TortoiseGit_en.xml:14011
\r
10719 msgid "common projects"
\r
10722 #: ../source/TortoiseGit_en.xml:14017
\r
10724 msgid "vendor projects"
\r
10727 #: ../source/TortoiseGit_en.xml:14019
\r
10729 msgid "Sometimes you will want to include another project within your working copy, perhaps some library code. You don't want to make a duplicate of this code in your repository because then you would lose connection with the original (and maintained) code. Or maybe you have several projects which share core code. There are at least 3 ways of dealing with this."
\r
10732 #: ../source/TortoiseGit_en.xml:14029
\r
10734 msgid "Use svn:externals"
\r
10737 #: ../source/TortoiseGit_en.xml:14030
\r
10739 msgid "Set the <literal>svn:externals</literal> property for a folder in your project. This property consists of one or more lines; each line has the name of a sub-folder which you want to use as the checkout folder for common code, and the repository URL that you want to be checked out there. For full details refer to <xref linkend=\"tsvn-dug-import-4\"/>."
\r
10742 #: ../source/TortoiseGit_en.xml:14038
\r
10744 msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects."
\r
10747 #: ../source/TortoiseGit_en.xml:14057
\r
10749 msgid "Of the three methods described, this is the only one which needs no setup on the client side. Once externals are specified in the folder properties, all clients will get populated folders when they update."
\r
10752 #: ../source/TortoiseGit_en.xml:14065
\r
10754 msgid "Use a nested working copy"
\r
10757 #: ../source/TortoiseGit_en.xml:14066
\r
10759 msgid "Create a new folder within your project to contain the common code, but do not add it to Git"
\r
10762 #: ../source/TortoiseGit_en.xml:14070
\r
10764 msgid "Select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Checkout</guimenuitem></menuchoice> for the new folder and checkout a copy of the common code into it. You now have a separate working copy nested within your main working copy."
\r
10767 #: ../source/TortoiseGit_en.xml:14080
\r
10769 msgid "The two working copies are independent. When you commit changes to the parent, changes to the nested WC are ignored. Likewise when you update the parent, the nested WC is not updated."
\r
10772 #: ../source/TortoiseGit_en.xml:14087
\r
10774 msgid "Use a relative location"
\r
10777 #: ../source/TortoiseGit_en.xml:14088
\r
10779 msgid "If you use the same common core code in several projects, and you do not want to keep multiple working copies of it for every project that uses it, you can just check it out to a separate location which is related to all the other projects which use it. For example: <screen>\nC:\\Projects\\Proj1\nC:\\Projects\\Proj2\nC:\\Projects\\Proj3\nC:\\Projects\\Common\n</screen> and refer to the common code using a relative path, eg. <filename>..\\..\\Common\\DSPcore</filename>."
\r
10782 #: ../source/TortoiseGit_en.xml:14103
\r
10784 msgid "If your projects are scattered in unrelated locations you can use a variant of this, which is to put the common code in one location and use drive letter substitution to map that location to something you can hard code in your projects, eg. Checkout the common code to <filename>D:\\Documents\\Framework</filename> or <filename>C:\\Documents and Settings\\{login}\\My Documents\\framework</filename> then use <screen>\nSUBST X: \"D:\\Documents\\framework\"\n</screen> to create the drive mapping used in your source code. Your code can then use absolute locations. <screen>\n#include \"X:\\superio\\superio.h\"\n</screen>"
\r
10787 #: ../source/TortoiseGit_en.xml:14121
\r
10789 msgid "This method will only work in an all-PC environment, and you will need to document the required drive mappings so your team know where these mysterious files are. This method is strictly for use in closed development environments, and not recommended for general use."
\r
10792 #: ../source/TortoiseGit_en.xml:14131
\r
10794 msgid "Create a shortcut to a repository"
\r
10797 #: ../source/TortoiseGit_en.xml:14133
\r
10802 #: ../source/TortoiseGit_en.xml:14135
\r
10804 msgid "If you frequently need to open the repository browser at a particular location, you can create a desktop shortcut using the automation interface to TortoiseProc. Just create a new shortcut and set the target to: <screen>\nTortoiseProc.exe /command:repobrowser /path:\"url/to/repository\"\n</screen> Of course you need to include the real repository URL."
\r
10807 #: ../source/TortoiseGit_en.xml:14147
\r
10809 msgid "Ignore files which are already versioned"
\r
10812 #: ../source/TortoiseGit_en.xml:14152
\r
10814 msgid "remove versioning"
\r
10817 #: ../source/TortoiseGit_en.xml:14155
\r
10819 msgid "detach from repository"
\r
10822 #: ../source/TortoiseGit_en.xml:14157
\r
10824 msgid "If you accidentally added some files which should have been ignored, how do you get them out of version control without losing them? Maybe you have your own IDE configuration file which is not part of the project, but which took you a long time to set up just the way you like it."
\r
10827 #: ../source/TortoiseGit_en.xml:14164
\r
10829 msgid "If you have not yet committed the add, then all you have to do is use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revert...</guimenuitem></menuchoice> to undo the add. You should then add the file(s) to the ignore list so they don't get added again later by mistake."
\r
10832 #: ../source/TortoiseGit_en.xml:14179
\r
10834 msgid "Hold the <keycap>Shift</keycap> key to get the extended context menu and use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete (keep local)</guimenuitem></menuchoice> to mark the file/folder for deletion from the repository without losing the local copy."
\r
10837 #: ../source/TortoiseGit_en.xml:14191
\r
10839 msgid "<menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Commit</guimenuitem></menuchoice> the parent folder."
\r
10842 #: ../source/TortoiseGit_en.xml:14200
\r
10844 msgid "Add the file/folder to the ignore list so you don't get into the same trouble again."
\r
10847 #: ../source/TortoiseGit_en.xml:14174
\r
10849 msgid "If the files are already in the repository, you have to do a little more work. <placeholder-1/>"
\r
10852 #: ../source/TortoiseGit_en.xml:14209
\r
10854 msgid "Unversion a working copy"
\r
10857 #: ../source/TortoiseGit_en.xml:14210
\r
10859 msgid "If you have a working copy which you want to convert back to a plain folder tree without the <literal>.svn</literal> directories, you can simply export it to itself. Read <xref linkend=\"tsvn-dug-export-unversion\"/> to find out how."
\r
10862 #: ../source/TortoiseGit_en.xml:14218
\r
10864 msgid "Remove a working copy"
\r
10867 #: ../source/TortoiseGit_en.xml:14219
\r
10869 msgid "If you have a working copy which you no longer need, how do you get rid of it cleanly? Easy - just delete it in Windows Explorer! Working copies are private local entities, and they are self-contained."
\r
10872 #: ../source/TortoiseGit_en.xml:14227
\r
10874 msgid "Useful Tips For Administrators"
\r
10877 #: ../source/TortoiseGit_en.xml:14229
\r
10879 msgid "This appendix contains solutions to problems/questions you might have when you are responsible for deploying TortoiseGit to multiple client computers."
\r
10882 #: ../source/TortoiseGit_en.xml:14236
\r
10884 msgid "Deploy TortoiseGit via group policies"
\r
10887 #: ../source/TortoiseGit_en.xml:14238
\r
10889 #: ../source/TortoiseGit_en.xml:14363
\r
10891 msgid "group policies"
\r
10894 #: ../source/TortoiseGit_en.xml:14241
\r
10896 #: ../source/TortoiseGit_en.xml:16345
\r
10901 #: ../source/TortoiseGit_en.xml:14244
\r
10906 #: ../source/TortoiseGit_en.xml:14247
\r
10908 msgid "domain controller"
\r
10911 #: ../source/TortoiseGit_en.xml:14250
\r
10916 #: ../source/TortoiseGit_en.xml:14252
\r
10918 msgid "The TortoiseGit installer comes as an MSI file, which means you should have no problems adding that MSI file to the group policies of your domain controller."
\r
10921 #: ../source/TortoiseGit_en.xml:14257
\r
10923 msgid "A good walk-through on how to do that can be found in the knowledge base article 314934 from Microsoft: <ulink url=\"http://support.microsoft.com/?kbid=314934\"><citetitle>http://support.microsoft.com/?kbid=314934</citetitle></ulink>."
\r
10926 #: ../source/TortoiseGit_en.xml:14264
\r
10928 msgid "Versions 1.3.0 and later of TortoiseGit must be installed under <emphasis>Computer Configuration</emphasis> and not under <emphasis>User Configuration</emphasis>. This is because those versions need the new CRT and MFC DLLs, which can only be deployed <emphasis>per computer</emphasis> and not <emphasis>per user</emphasis>. If you really must install TortoiseGit on a per user basis, then you must first install the MFC and CRT package version 8 from Microsoft on each computer you want to install TortoiseGit as per user."
\r
10931 #: ../source/TortoiseGit_en.xml:14276
\r
10933 msgid "Redirect the upgrade check"
\r
10936 #: ../source/TortoiseGit_en.xml:14278
\r
10938 msgid "upgrade check"
\r
10941 #: ../source/TortoiseGit_en.xml:14281
\r
10943 msgid "check new version"
\r
10946 #: ../source/TortoiseGit_en.xml:14284
\r
10951 #: ../source/TortoiseGit_en.xml:14286
\r
10953 msgid "TortoiseGit checks if there's a new version available every few days. If there is a newer version available, a dialog shows up informing the user about that."
\r
10956 #: ../source/TortoiseGit_en.xml:14292
\r
10958 msgid "The upgrade dialog"
\r
10961 #: ../source/TortoiseGit_en.xml:14295
\r
10963 msgid "If you're responsible for a lot of users in your domain, you might want your users to use only versions you have approved and not have them install always the latest version. You probably don't want that upgrade dialog to show up so your users don't go and upgrade immediately."
\r
10966 #: ../source/TortoiseGit_en.xml:14301
\r
10968 msgid "Versions 1.4.0 and later of TortoiseGit allow you to redirect that upgrade check to your intranet server. You can set the registry key <filename>HKCU\\Software\\TortoiseGit\\UpdateCheckURL</filename> (string value) to an URL pointing to a text file in your intranet. That text file must have the following format: <screen>\n1.4.1.6000\nA new version of TortoiseGit is available for you to download!\nhttp://192.168.2.1/downloads/TortoiseGit-1.4.1.6000-svn-1.4.0.msi\n</screen> The first line in that file is the version string. You must make sure that it matches the exact version string of the TortoiseGit installation package. The second line is a custom text, shown in the upgrade dialog. You can write there whatever you want. Just note that the space in the upgrade dialog is limited. Too long messages will get truncated! The third line is the URL to the new installation package. This URL is opened when the user clicks on the custom message label in the upgrade dialog. You can also just point the user to a web page instead of the MSI file directly. The URL is opened with the default web browser, so if you specify a web page, that page is opened and shown to the user. If you specify the MSI package, the browser will ask the user to save the MSI file locally."
\r
10971 #: ../source/TortoiseGit_en.xml:14326
\r
10973 msgid "Setting the <literal>SVN_ASP_DOT_NET_HACK</literal> environment variable"
\r
10976 #: ../source/TortoiseGit_en.xml:14328
\r
10978 msgid "SVN_ASP_DOT_NET_HACK"
\r
10981 #: ../source/TortoiseGit_en.xml:14331
\r
10986 #: ../source/TortoiseGit_en.xml:14334
\r
10988 msgid "ASP projects"
\r
10991 #: ../source/TortoiseGit_en.xml:14336
\r
10993 msgid "As of version 1.4.0 and later, the TortoiseGit installer doesn't provide the user with the option to set the <literal>SVN_ASP_DOT_NET_HACK</literal> environment variable anymore, since that caused many problems and confusions with users which always install <emphasis>everything</emphasis> no matter if they know what it is for."
\r
10996 #: ../source/TortoiseGit_en.xml:14344
\r
10998 msgid "But that option is only hidden for the user. You still can force the TortoiseGit installer to set that environment variable by setting the <literal>ASPDOTNETHACK</literal> property to TRUE. For example, you can start the installer like this: <screen>\nmsiexec /i TortoiseGit-1.4.0.msi ASPDOTNETHACK=TRUE\n</screen>"
\r
11001 #: ../source/TortoiseGit_en.xml:14355
\r
11003 msgid "Disable context menu entries"
\r
11006 #: ../source/TortoiseGit_en.xml:14357
\r
11008 msgid "context menu entries"
\r
11011 #: ../source/TortoiseGit_en.xml:14360
\r
11013 msgid "disable functions"
\r
11016 #: ../source/TortoiseGit_en.xml:14365
\r
11018 msgid "As of version 1.5.0 and later, TortoiseGit allows you to disable (actually, hide) context menu entries. Since this is a feature which should not be used lightly but only if there is a compelling reason, there is no GUI for this and it has to be done directly in the registry. This can be used to disable certain commands for users who should not use them. But please note that only the context menu entries in the <emphasis>explorer</emphasis> are hidden, and the commands are still available through other means, e.g. the command line or even other dialogs in TortoiseGit itself!"
\r
11021 #: ../source/TortoiseGit_en.xml:14375
\r
11023 msgid "The registry keys which hold the information on which context menus to show are <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskLow</filename> and <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskHigh</filename>."
\r
11026 #: ../source/TortoiseGit_en.xml:14380
\r
11028 msgid "Each of these registry entries is a <literal>DWORD</literal> value, with each bit corresponding to a specific menu entry. A set bit means the corresponding menu entry is deactivated."
\r
11031 #: ../source/TortoiseGit_en.xml:14387
\r
11033 msgid "Menu entries and their values"
\r
11036 #: ../source/TortoiseGit_en.xml:14393
\r
11041 #: ../source/TortoiseGit_en.xml:14394
\r
11043 msgid "Menu entry"
\r
11046 #: ../source/TortoiseGit_en.xml:14400
\r
11048 #: ../source/TortoiseGit_en.xml:15217
\r
11050 #: ../source/TortoiseGit_en.xml:16245
\r
11055 #: ../source/TortoiseGit_en.xml:14404
\r
11057 #: ../source/TortoiseGit_en.xml:15235
\r
11059 #: ../source/TortoiseGit_en.xml:16551
\r
11064 #: ../source/TortoiseGit_en.xml:14408
\r
11066 #: ../source/TortoiseGit_en.xml:15274
\r
11068 #: ../source/TortoiseGit_en.xml:16271
\r
11073 #: ../source/TortoiseGit_en.xml:14412
\r
11075 #: ../source/TortoiseGit_en.xml:15584
\r
11077 #: ../source/TortoiseGit_en.xml:16188
\r
11082 #: ../source/TortoiseGit_en.xml:14416
\r
11084 #: ../source/TortoiseGit_en.xml:15443
\r
11086 #: ../source/TortoiseGit_en.xml:16484
\r
11091 #: ../source/TortoiseGit_en.xml:14424
\r
11093 #: ../source/TortoiseGit_en.xml:16472
\r
11098 #: ../source/TortoiseGit_en.xml:14436
\r
11100 #: ../source/TortoiseGit_en.xml:15547
\r
11102 #: ../source/TortoiseGit_en.xml:16326
\r
11107 #: ../source/TortoiseGit_en.xml:14440
\r
11109 msgid "Create Repository here"
\r
11112 #: ../source/TortoiseGit_en.xml:14444
\r
11114 #: ../source/TortoiseGit_en.xml:15499
\r
11116 msgid "Branch/Tag"
\r
11119 #: ../source/TortoiseGit_en.xml:14448
\r
11121 #: ../source/TortoiseGit_en.xml:15530
\r
11123 #: ../source/TortoiseGit_en.xml:16398
\r
11128 #: ../source/TortoiseGit_en.xml:14452
\r
11130 #: ../source/TortoiseGit_en.xml:15437
\r
11132 #: ../source/TortoiseGit_en.xml:16305
\r
11137 #: ../source/TortoiseGit_en.xml:14456
\r
11139 #: ../source/TortoiseGit_en.xml:15431
\r
11144 #: ../source/TortoiseGit_en.xml:14460
\r
11146 msgid "Update to revision"
\r
11149 #: ../source/TortoiseGit_en.xml:14464
\r
11151 #: ../source/TortoiseGit_en.xml:15321
\r
11153 #: ../source/TortoiseGit_en.xml:16317
\r
11158 #: ../source/TortoiseGit_en.xml:14468
\r
11160 #: ../source/TortoiseGit_en.xml:15342
\r
11165 #: ../source/TortoiseGit_en.xml:14472
\r
11167 #: ../source/TortoiseGit_en.xml:15417
\r
11169 msgid "Edit Conflicts"
\r
11172 #: ../source/TortoiseGit_en.xml:14476
\r
11174 #: ../source/TortoiseGit_en.xml:15572
\r
11176 #: ../source/TortoiseGit_en.xml:16444
\r
11181 #: ../source/TortoiseGit_en.xml:14480
\r
11183 msgid "Check for modifications"
\r
11186 #: ../source/TortoiseGit_en.xml:14484
\r
11191 #: ../source/TortoiseGit_en.xml:14488
\r
11193 msgid "Repository Browser"
\r
11196 #: ../source/TortoiseGit_en.xml:14492
\r
11198 #: ../source/TortoiseGit_en.xml:15604
\r
11200 #: ../source/TortoiseGit_en.xml:16209
\r
11205 #: ../source/TortoiseGit_en.xml:14496
\r
11207 #: ../source/TortoiseGit_en.xml:15630
\r
11209 msgid "Create Patch"
\r
11212 #: ../source/TortoiseGit_en.xml:14500
\r
11214 #: ../source/TortoiseGit_en.xml:15640
\r
11216 msgid "Apply Patch"
\r
11219 #: ../source/TortoiseGit_en.xml:14504
\r
11221 msgid "Revision graph"
\r
11224 #: ../source/TortoiseGit_en.xml:14508
\r
11226 #: ../source/TortoiseGit_en.xml:16370
\r
11231 #: ../source/TortoiseGit_en.xml:14512
\r
11233 msgid "Remove Lock"
\r
11236 #: ../source/TortoiseGit_en.xml:14516
\r
11238 msgid "Properties"
\r
11241 #: ../source/TortoiseGit_en.xml:14520
\r
11243 msgid "Diff with URL"
\r
11246 #: ../source/TortoiseGit_en.xml:14524
\r
11248 msgid "Delete unversioned items"
\r
11251 #: ../source/TortoiseGit_en.xml:14528
\r
11256 #: ../source/TortoiseGit_en.xml:14532
\r
11261 #: ../source/TortoiseGit_en.xml:14536
\r
11266 #: ../source/TortoiseGit_en.xml:14542
\r
11268 msgid "Example: to disable the <quote>Relocate</quote> the <quote>Delete unversioned items</quote> and the <quote>Settings</quote> menu entries, add the values assigned to the entries like this: <screen>\n 0x0000000000080000\n+ 0x0000000080000000\n+ 0x2000000000000000\n= 0x2000000080080000\n</screen> The lower <literal>DWORD</literal> value (<literal>0x80080000</literal>) must then be stored in <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskLow</filename>, the higher <literal>DWORD</literal> value (<literal>0x20000000</literal>) in <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskHigh</filename>."
\r
11271 #: ../source/TortoiseGit_en.xml:14559
\r
11273 msgid "To enable the menu entries again, simply delete the two registry keys."
\r
11276 #: ../source/TortoiseGit_en.xml:14565
\r
11278 msgid "Automating TortoiseGit"
\r
11281 #: ../source/TortoiseGit_en.xml:14567
\r
11283 msgid "Since all commands for TortoiseGit are controlled through command line parameters, you can automate it with batch scripts or start specific commands and dialogs from other programs (e.g. your favourite text editor)."
\r
11286 #: ../source/TortoiseGit_en.xml:14573
\r
11288 msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead."
\r
11291 #: ../source/TortoiseGit_en.xml:14585
\r
11293 #: ../source/TortoiseGit_en.xml:15215
\r
11295 msgid "TortoiseGit Commands"
\r
11298 #: ../source/TortoiseGit_en.xml:14587
\r
11300 #: ../source/TortoiseGit_en.xml:15060
\r
11302 msgid "automation"
\r
11305 #: ../source/TortoiseGit_en.xml:14590
\r
11307 #: ../source/TortoiseGit_en.xml:15063
\r
11309 msgid "command line"
\r
11312 #: ../source/TortoiseGit_en.xml:14592
\r
11314 msgid "The TortoiseGit GUI program is called <literal>TortoiseProc.exe</literal>. All commands are specified with the parameter <option>/command:abcd</option> where <literal>abcd</literal> is the required command name. Most of these commands need at least one path argument, which is given with <option>/path:\"some\\path\"</option>. In the following table the command refers to the <option>/command:abcd</option> parameter and the path refers to the <option>/path:\"some\\path\"</option> parameter."
\r
11317 #: ../source/TortoiseGit_en.xml:14601
\r
11319 msgid "Since some of the commands can take a list of target paths (e.g. committing several specific files) the <option>/path</option> parameter can take several paths, separated by a <literal>*</literal> character."
\r
11322 #: ../source/TortoiseGit_en.xml:14606
\r
11324 msgid "TortoiseGit uses temporary files to pass multiple arguments between the shell extension and the main program. From TortoiseGit 1.5.0 on and later, <option>/notempfile</option> parameter is obsolete and there is no need to add it anymore."
\r
11327 #: ../source/TortoiseGit_en.xml:14612
\r
11329 msgid "The progress dialog which is used for commits, updates and many more commands usually stays open after the command has finished until the user presses the <guibutton>OK</guibutton> button. This can be changed by checking the corresponding option in the settings dialog. But using that setting will close the progress dialog, no matter if you start the command from your batch file or from the TortoiseGit context menu."
\r
11332 #: ../source/TortoiseGit_en.xml:14620
\r
11334 msgid "To specify a different location of the configuration file, use the parameter <option>/configdir:\"path\\to\\config\\directory\"</option>. This will override the default path, including any registry setting."
\r
11337 #: ../source/TortoiseGit_en.xml:14631
\r
11339 msgid "<option>/closeonend:0</option> don't close the dialog automatically"
\r
11342 #: ../source/TortoiseGit_en.xml:14636
\r
11344 msgid "<option>/closeonend:1</option> auto close if no errors"
\r
11347 #: ../source/TortoiseGit_en.xml:14641
\r
11349 msgid "<option>/closeonend:2</option> auto close if no errors and conflicts"
\r
11352 #: ../source/TortoiseGit_en.xml:14646
\r
11354 msgid "<option>/closeonend:3</option> auto close if no errors, conflicts and merges"
\r
11357 #: ../source/TortoiseGit_en.xml:14651
\r
11359 msgid "<option>/closeonend:4</option> auto close if no errors, conflicts and merges for local operations"
\r
11362 #: ../source/TortoiseGit_en.xml:14625
\r
11364 msgid "To close the progress dialog at the end of a command automatically without using the permanent setting you can pass the <option>/closeonend</option> parameter. <placeholder-1/>"
\r
11367 #: ../source/TortoiseGit_en.xml:14658
\r
11369 msgid "The table below lists all the commands which can be accessed using the TortoiseProc.exe command line. As described above, these should be used in the form <literal>/command:abcd</literal>. In the table, the <literal>/command</literal> prefix is omitted to save space."
\r
11372 #: ../source/TortoiseGit_en.xml:14677
\r
11374 msgid "List of available commands and options"
\r
11377 #: ../source/TortoiseGit_en.xml:14683
\r
11382 #: ../source/TortoiseGit_en.xml:14690
\r
11384 msgid "Shows the about dialog. This is also shown if no command is given."
\r
11387 #: ../source/TortoiseGit_en.xml:14698
\r
11389 #: ../source/TortoiseGit_en.xml:14709
\r
11391 #: ../source/TortoiseGit_en.xml:14717
\r
11393 #: ../source/TortoiseGit_en.xml:14724
\r
11395 #: ../source/TortoiseGit_en.xml:14736
\r
11397 #: ../source/TortoiseGit_en.xml:14753
\r
11399 #: ../source/TortoiseGit_en.xml:14761
\r
11401 #: ../source/TortoiseGit_en.xml:14769
\r
11403 #: ../source/TortoiseGit_en.xml:14776
\r
11405 #: ../source/TortoiseGit_en.xml:14785
\r
11407 #: ../source/TortoiseGit_en.xml:14791
\r
11409 #: ../source/TortoiseGit_en.xml:14798
\r
11411 #: ../source/TortoiseGit_en.xml:14799
\r
11413 #: ../source/TortoiseGit_en.xml:14801
\r
11415 #: ../source/TortoiseGit_en.xml:14807
\r
11417 #: ../source/TortoiseGit_en.xml:14823
\r
11419 #: ../source/TortoiseGit_en.xml:14831
\r
11421 #: ../source/TortoiseGit_en.xml:14852
\r
11423 #: ../source/TortoiseGit_en.xml:14859
\r
11425 #: ../source/TortoiseGit_en.xml:14869
\r
11427 #: ../source/TortoiseGit_en.xml:14875
\r
11429 #: ../source/TortoiseGit_en.xml:14908
\r
11431 #: ../source/TortoiseGit_en.xml:14914
\r
11433 #: ../source/TortoiseGit_en.xml:14927
\r
11435 #: ../source/TortoiseGit_en.xml:14936
\r
11437 #: ../source/TortoiseGit_en.xml:14936
\r
11439 #: ../source/TortoiseGit_en.xml:14942
\r
11441 #: ../source/TortoiseGit_en.xml:14950
\r
11443 #: ../source/TortoiseGit_en.xml:14985
\r
11445 #: ../source/TortoiseGit_en.xml:14995
\r
11447 #: ../source/TortoiseGit_en.xml:15002
\r
11449 #: ../source/TortoiseGit_en.xml:15009
\r
11451 #: ../source/TortoiseGit_en.xml:15018
\r
11453 #: ../source/TortoiseGit_en.xml:15035
\r
11458 #: ../source/TortoiseGit_en.xml:14701
\r
11460 #: ../source/TortoiseGit_en.xml:14877
\r
11462 msgid "/startrev:xxx"
\r
11465 #: ../source/TortoiseGit_en.xml:14702
\r
11467 #: ../source/TortoiseGit_en.xml:14878
\r
11469 msgid "/endrev:xxx"
\r
11472 #: ../source/TortoiseGit_en.xml:14703
\r
11477 #: ../source/TortoiseGit_en.xml:14697
\r
11479 msgid "Opens the log dialog. The <placeholder-1/> specifies the file or folder for which the log should be shown. Three additional options can be set: <placeholder-2/>, <placeholder-3/> and <placeholder-4/>"
\r
11482 #: ../source/TortoiseGit_en.xml:14710
\r
11484 #: ../source/TortoiseGit_en.xml:14833
\r
11489 #: ../source/TortoiseGit_en.xml:14708
\r
11491 msgid "Opens the checkout dialog. The <placeholder-1/> specifies the target directory and the <placeholder-2/> specifies the URL to checkout from."
\r
11494 #: ../source/TortoiseGit_en.xml:14716
\r
11496 msgid "Opens the import dialog. The <placeholder-1/> specifies the directory with the data to import."
\r
11499 #: ../source/TortoiseGit_en.xml:14725
\r
11504 #: ../source/TortoiseGit_en.xml:14728
\r
11506 msgid "/rev:1234"
\r
11509 #: ../source/TortoiseGit_en.xml:14729
\r
11511 msgid "/nonrecursive"
\r
11514 #: ../source/TortoiseGit_en.xml:14730
\r
11516 msgid "/ignoreexternals"
\r
11519 #: ../source/TortoiseGit_en.xml:14723
\r
11521 msgid "Updates the working copy in <placeholder-1/> to HEAD. If the option <placeholder-2/> is given then a dialog is shown to ask the user to which revision the update should go. To avoid the dialog specify a revision number <placeholder-3/>. Other options are <placeholder-4/> and <placeholder-5/>."
\r
11524 #: ../source/TortoiseGit_en.xml:14738
\r
11526 #: ../source/TortoiseGit_en.xml:14835
\r
11531 #: ../source/TortoiseGit_en.xml:14741
\r
11533 #: ../source/TortoiseGit_en.xml:14838
\r
11535 msgid "/logmsgfile:path"
\r
11538 #: ../source/TortoiseGit_en.xml:14742
\r
11540 #: ../source/TortoiseGit_en.xml:14839
\r
11545 #: ../source/TortoiseGit_en.xml:14746
\r
11547 msgid "/bugid:\"the bug id here\""
\r
11550 #: ../source/TortoiseGit_en.xml:14735
\r
11552 msgid "Opens the commit dialog. The <placeholder-1/> specifies the target directory or the list of files to commit. You can also specify the <placeholder-2/> switch to pass a predefined log message to the commit dialog. Or, if you don't want to pass the log message on the command line, use <placeholder-3/>, where <placeholder-4/> points to a file containing the log message. To pre-fill the bug ID box (in case you've set up integration with bug trackers properly), you can use the <placeholder-5/> to do that."
\r
11555 #: ../source/TortoiseGit_en.xml:14752
\r
11557 msgid "Adds the files in <placeholder-1/> to version control."
\r
11560 #: ../source/TortoiseGit_en.xml:14759
\r
11562 msgid "Reverts local modifications of a working copy. The <placeholder-1/> tells which items to revert."
\r
11565 #: ../source/TortoiseGit_en.xml:14767
\r
11567 msgid "Cleans up interrupted or aborted operations and unlocks the working copy in <placeholder-1/>."
\r
11570 #: ../source/TortoiseGit_en.xml:14777
\r
11572 #: ../source/TortoiseGit_en.xml:14862
\r
11574 #: ../source/TortoiseGit_en.xml:15028
\r
11576 msgid "/noquestion"
\r
11579 #: ../source/TortoiseGit_en.xml:14774
\r
11581 msgid "Marks a conflicted file specified in <placeholder-1/> as resolved. If <placeholder-2/> is given, then resolving is done without asking the user first if it really should be done."
\r
11584 #: ../source/TortoiseGit_en.xml:14784
\r
11586 msgid "Creates a repository in <placeholder-1/>"
\r
11589 #: ../source/TortoiseGit_en.xml:14790
\r
11591 msgid "Opens the switch dialog. The <placeholder-1/> specifies the target directory."
\r
11594 #: ../source/TortoiseGit_en.xml:14797
\r
11596 msgid "Exports the working copy in <placeholder-1/> to another directory. If the <placeholder-2/> points to an unversioned directory, a dialog will ask for an URL to export to the directory in <placeholder-3/>."
\r
11599 #: ../source/TortoiseGit_en.xml:14810
\r
11601 #: ../source/TortoiseGit_en.xml:14813
\r
11603 msgid "/fromurl:URL"
\r
11606 #: ../source/TortoiseGit_en.xml:14811
\r
11608 msgid "/revrange:string"
\r
11611 #: ../source/TortoiseGit_en.xml:14814
\r
11613 msgid "/tourl:URL"
\r
11616 #: ../source/TortoiseGit_en.xml:14815
\r
11618 msgid "/fromrev:xxx"
\r
11621 #: ../source/TortoiseGit_en.xml:14816
\r
11623 msgid "/torev:xxx"
\r
11626 #: ../source/TortoiseGit_en.xml:14806
\r
11628 msgid "Opens the merge dialog. The <placeholder-1/> specifies the target directory. For merging a revision range, the following options are available: <placeholder-2/>, <placeholder-3/>. For merging two repository trees, the following options are available: <placeholder-4/>, <placeholder-5/>, <placeholder-6/> and <placeholder-7/>. These pre-fill the relevant fields in the merge dialog."
\r
11631 #: ../source/TortoiseGit_en.xml:14822
\r
11633 msgid "Opens the merge all dialog. The <placeholder-1/> specifies the target directory."
\r
11636 #: ../source/TortoiseGit_en.xml:14829
\r
11638 msgid "Brings up the branch/tag dialog. The <placeholder-1/> is the working copy to branch/tag from. And the <placeholder-2/> is the target URL. You can also specify the <placeholder-3/> switch to pass a predefined log message to the branch/tag dialog. Or, if you don't want to pass the log message on the command line, use <placeholder-4/>, where <placeholder-5/> points to a file containing the log message."
\r
11641 #: ../source/TortoiseGit_en.xml:14845
\r
11643 msgid "Opens the settings dialog."
\r
11646 #: ../source/TortoiseGit_en.xml:14851
\r
11648 msgid "Removes the file(s) in <placeholder-1/> from version control."
\r
11651 #: ../source/TortoiseGit_en.xml:14858
\r
11653 msgid "Renames the file in <placeholder-1/>. The new name for the file is asked with a dialog. To avoid the question about renaming similar files in one step, pass <placeholder-2/>."
\r
11656 #: ../source/TortoiseGit_en.xml:14871
\r
11658 #: ../source/TortoiseGit_en.xml:14873
\r
11660 #: ../source/TortoiseGit_en.xml:14879
\r
11665 #: ../source/TortoiseGit_en.xml:14879
\r
11670 #: ../source/TortoiseGit_en.xml:14867
\r
11672 msgid "Starts the external diff program specified in the TortoiseGit settings. The <placeholder-1/> specifies the first file. If the option <placeholder-2/> is set, then the diff program is started with those two files. If <placeholder-3/> is omitted, then the diff is done between the file in <placeholder-4/> and its BASE. To explicitly set the revision numbers use <placeholder-5/> and <placeholder-6/>. If <placeholder-7/> is set and <placeholder-8/> is not set, then the diff is done by first blaming the files with the given revisions."
\r
11675 #: ../source/TortoiseGit_en.xml:14887
\r
11677 msgid "Depending on the URLs and revisions to compare, this either shows a unified diff (if the option <option>unified</option> is set), a dialog with a list of files that have changed or if the URLs point to files starts the diff viewer for those two files."
\r
11680 #: ../source/TortoiseGit_en.xml:14894
\r
11682 msgid "The options <option>url1</option>, <option>url2</option>, <option>revision1</option> and <option>revision2</option> must be specified. The options <option>pegrevision</option>, <option>ignoreancestry</option>, <option>blame</option> and <option>unified</option> are optional."
\r
11685 #: ../source/TortoiseGit_en.xml:14905
\r
11687 msgid "Starts the conflict editor specified in the TortoiseGit settings with the correct files for the conflicted file in <placeholder-1/>."
\r
11690 #: ../source/TortoiseGit_en.xml:14913
\r
11692 msgid "Opens the relocate dialog. The <placeholder-1/> specifies the working copy path to relocate."
\r
11695 #: ../source/TortoiseGit_en.xml:14920
\r
11697 msgid "Opens the help file."
\r
11700 #: ../source/TortoiseGit_en.xml:14926
\r
11702 msgid "Opens the check-for-modifications dialog. The <placeholder-1/> specifies the working copy directory."
\r
11705 #: ../source/TortoiseGit_en.xml:14938
\r
11707 #: ../source/TortoiseGit_en.xml:14940
\r
11712 #: ../source/TortoiseGit_en.xml:14943
\r
11714 msgid "/projectpropertiespath:path/to/wc"
\r
11717 #: ../source/TortoiseGit_en.xml:14933
\r
11719 msgid "Starts the repository browser dialog, pointing to the URL of the working copy given in <placeholder-1/> or <placeholder-2/> points directly to an URL. An additional option <placeholder-3/> can be used to specify the revision which the repository browser should show. If the <placeholder-4/> is omitted, it defaults to HEAD. If <placeholder-5/> points to an URL, the <placeholder-6/> specifies the path from where to read and use the project properties."
\r
11722 #: ../source/TortoiseGit_en.xml:14951
\r
11724 msgid "svn:ignore"
\r
11727 #: ../source/TortoiseGit_en.xml:14949
\r
11729 msgid "Adds all targets in <placeholder-1/> to the ignore list, i.e. adds the <placeholder-2/> property to those files."
\r
11732 #: ../source/TortoiseGit_en.xml:14958
\r
11734 msgid "Opens the blame dialog for the file specified in <option>/path</option>."
\r
11737 #: ../source/TortoiseGit_en.xml:14962
\r
11739 msgid "If the options <option>/startrev</option> and <option>/endrev</option> are set, then the dialog asking for the blame range is not shown but the revision values of those options are used instead."
\r
11742 #: ../source/TortoiseGit_en.xml:14969
\r
11744 msgid "If the option <option>/line:nnn</option> is set, TortoiseBlame will open with the specified line number showing."
\r
11747 #: ../source/TortoiseGit_en.xml:14974
\r
11749 msgid "The options <option>/ignoreeol</option>, <option>/ignorespaces</option> and <option>/ignoreallspaces</option> are also supported."
\r
11752 #: ../source/TortoiseGit_en.xml:14986
\r
11754 msgid "/savepath:path"
\r
11757 #: ../source/TortoiseGit_en.xml:14987
\r
11759 msgid "/revision:xxx"
\r
11762 #: ../source/TortoiseGit_en.xml:14983
\r
11764 msgid "Saves a file from an URL or working copy path given in <placeholder-1/> to the location given in <placeholder-2/>. The revision is given in <placeholder-3/>. This can be used to get a file with a specific revision."
\r
11767 #: ../source/TortoiseGit_en.xml:14993
\r
11769 msgid "Creates a patch file for the path given in <placeholder-1/>."
\r
11772 #: ../source/TortoiseGit_en.xml:15000
\r
11774 msgid "Shows the revision graph for the path given in <placeholder-1/>."
\r
11777 #: ../source/TortoiseGit_en.xml:15007
\r
11779 msgid "Locks a file or all files in a directory given in <placeholder-1/>. The 'lock' dialog is shown so the user can enter a comment for the lock."
\r
11782 #: ../source/TortoiseGit_en.xml:15016
\r
11784 msgid "Unlocks a file or all files in a directory given in <placeholder-1/>."
\r
11787 #: ../source/TortoiseGit_en.xml:15023
\r
11789 msgid "Rebuilds the windows icon cache. Only use this in case the windows icons are corrupted. A side effect of this (which can't be avoided) is that the icons on the desktop get rearranged. To suppress the message box, pass <placeholder-1/>."
\r
11792 #: ../source/TortoiseGit_en.xml:15033
\r
11794 msgid "Shows the properties dialog for the path given in <placeholder-1/>."
\r
11797 #: ../source/TortoiseGit_en.xml:15042
\r
11799 msgid "Examples (which should be entered on one line): <screen>\nTortoiseProc.exe /command:commit\n /path:\"c:\\svn_wc\\file1.txt*c:\\svn_wc\\file2.txt\"\n /logmsg:\"test log message\" /closeonend:0\n\nTortoiseProc.exe /command:update /path:\"c:\\svn_wc\\\" /closeonend:0\n\nTortoiseProc.exe /command:log /path:\"c:\\svn_wc\\file1.txt\"\n /startrev:50 /endrev:60 /closeonend:0\n</screen>"
\r
11802 #: ../source/TortoiseGit_en.xml:15058
\r
11804 msgid "TortoiseIDiff Commands"
\r
11807 #: ../source/TortoiseGit_en.xml:15065
\r
11809 msgid "The image diff tool has a few command line options which you can use to control how the tool is started. The program is called <literal>TortoiseIDiff.exe</literal>."
\r
11812 #: ../source/TortoiseGit_en.xml:15070
\r
11814 msgid "The table below lists all the options which can be passed to the image diff tool on the command line."
\r
11817 #: ../source/TortoiseGit_en.xml:15086
\r
11819 msgid "List of available options"
\r
11822 #: ../source/TortoiseGit_en.xml:15092
\r
11827 #: ../source/TortoiseGit_en.xml:15099
\r
11829 msgid "Path to the file shown on the left."
\r
11832 #: ../source/TortoiseGit_en.xml:15105
\r
11834 #: ../source/TortoiseGit_en.xml:15118
\r
11836 msgid "A title string. This string is used in the image view title instead of the full path to the image file."
\r
11839 #: ../source/TortoiseGit_en.xml:15112
\r
11841 msgid "Path to the file shown on the right."
\r
11844 #: ../source/TortoiseGit_en.xml:15125
\r
11846 msgid "If specified, the image diff tool switches to the overlay mode (alpha blend)."
\r
11849 #: ../source/TortoiseGit_en.xml:15132
\r
11851 msgid "If specified, the image diff tool fits both images together."
\r
11854 #: ../source/TortoiseGit_en.xml:15139
\r
11856 msgid "Shows the image info box."
\r
11859 #: ../source/TortoiseGit_en.xml:15147
\r
11861 msgid "Example (which should be entered on one line): <screen>\nTortoiseIDiff.exe /left:\"c:\\images\\img1.jpg\" /lefttitle:\"image 1\"\n /right:\"c:\\images\\img2.jpg\" /righttitle:\"image 2\"\n /fit /overlay\n</screen>"
\r
11864 #: ../source/TortoiseGit_en.xml:15159
\r
11866 msgid "Command Line Interface Cross Reference"
\r
11869 #: ../source/TortoiseGit_en.xml:15162
\r
11871 msgid "command line client"
\r
11874 #: ../source/TortoiseGit_en.xml:15165
\r
11879 #: ../source/TortoiseGit_en.xml:15167
\r
11881 msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations."
\r
11884 #: ../source/TortoiseGit_en.xml:15176
\r
11886 msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does <emphasis>not</emphasis> call the CLI but uses the Git library directly."
\r
11889 #: ../source/TortoiseGit_en.xml:15182
\r
11891 msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try."
\r
11894 #: ../source/TortoiseGit_en.xml:15190
\r
11896 msgid "Conventions and Basic Rules"
\r
11899 #: ../source/TortoiseGit_en.xml:15191
\r
11901 msgid "In the descriptions which follow, the URL for a repository location is shown simply as <literal>URL</literal>, and an example might be <systemitem class=\"url\">http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk</systemitem>. The working copy path is shown simply as <literal>PATH</literal>, and an example might be <filename>C:\\TortoiseGit\\trunk</filename>."
\r
11904 #: ../source/TortoiseGit_en.xml:15201
\r
11906 msgid "Because TortoiseGit is a Windows Shell Extension, it is not able to use the notion of a current working directory. All working copy paths must be given using the absolute path, not a relative path."
\r
11909 #: ../source/TortoiseGit_en.xml:15208
\r
11911 msgid "Certain items are optional, and these are often controlled by checkboxes or radio buttons in TortoiseGit. These options are shown in [square brackets] in the command line definitions."
\r
11914 #: ../source/TortoiseGit_en.xml:15218
\r
11917 msgid "\nsvn checkout [-N] [--ignore-externals] [-r rev] URL PATH\n"
\r
11920 #: ../source/TortoiseGit_en.xml:15221
\r
11922 msgid "If <guilabel>Only checkout the top folder</guilabel> is checked, use the <literal>-N</literal> switch."
\r
11925 #: ../source/TortoiseGit_en.xml:15225
\r
11927 #: ../source/TortoiseGit_en.xml:15268
\r
11929 msgid "If <guilabel>Omit externals</guilabel> is checked, use the <literal>--ignore-externals</literal> switch."
\r
11932 #: ../source/TortoiseGit_en.xml:15229
\r
11934 msgid "If you are checking out a specific revision, specify that after the URL using <literal>-r</literal> switch."
\r
11937 #: ../source/TortoiseGit_en.xml:15236
\r
11940 msgid "\nsvn info URL_of_WC\nsvn update [-r rev] PATH\n"
\r
11943 #: ../source/TortoiseGit_en.xml:15240
\r
11945 msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy."
\r
11948 #: ../source/TortoiseGit_en.xml:15247
\r
11950 msgid "If only one item is selected for updating or the selected items are not all from the same repository, TortoiseGit just updates to HEAD."
\r
11953 #: ../source/TortoiseGit_en.xml:15252
\r
11955 msgid "No command line options are used here. <guilabel>Update to revision</guilabel> also implements the update command, but offers more options."
\r
11958 #: ../source/TortoiseGit_en.xml:15259
\r
11960 msgid "Update to Revision"
\r
11963 #: ../source/TortoiseGit_en.xml:15260
\r
11966 msgid "\nsvn info URL_of_WC\nsvn update [-r rev] [-N] [--ignore-externals] PATH\n"
\r
11969 #: ../source/TortoiseGit_en.xml:15264
\r
11971 msgid "If <guilabel>Only update the top folder</guilabel> is checked, use the <literal>-N</literal> switch."
\r
11974 #: ../source/TortoiseGit_en.xml:15275
\r
11976 msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit."
\r
11979 #: ../source/TortoiseGit_en.xml:15282
\r
11981 #: ../source/TortoiseGit_en.xml:15444
\r
11983 #: ../source/TortoiseGit_en.xml:15472
\r
11986 msgid "\nsvn status -v PATH\n"
\r
11989 #: ../source/TortoiseGit_en.xml:15285
\r
11991 #: ../source/TortoiseGit_en.xml:15373
\r
11993 msgid "If <guilabel>Show unversioned files</guilabel> is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the <literal>svn status</literal> command does not descend into unversioned folders."
\r
11996 #: ../source/TortoiseGit_en.xml:15293
\r
11998 msgid "If you check any unversioned files and folders, those items will first be added to your working copy."
\r
12001 #: ../source/TortoiseGit_en.xml:15297
\r
12003 #: ../source/TortoiseGit_en.xml:15585
\r
12006 msgid "\nsvn add PATH...\n"
\r
12009 #: ../source/TortoiseGit_en.xml:15300
\r
12011 msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (<literal>-N</literal>) must be used, and every path must be specified individually on the commit command line."
\r
12014 #: ../source/TortoiseGit_en.xml:15308
\r
12017 msgid "\nsvn commit -m \"LogMessage\" [-N] [--no-unlock] PATH...\n"
\r
12020 #: ../source/TortoiseGit_en.xml:15311
\r
12022 #: ../source/TortoiseGit_en.xml:15517
\r
12024 #: ../source/TortoiseGit_en.xml:15598
\r
12026 msgid "<literal>LogMessage</literal> here represents the contents of the log message edit box. This can be empty."
\r
12029 #: ../source/TortoiseGit_en.xml:15315
\r
12031 msgid "If <guilabel>Keep locks</guilabel> is checked, use the <literal>--no-unlock</literal> switch."
\r
12034 #: ../source/TortoiseGit_en.xml:15322
\r
12037 msgid "\nsvn diff PATH\n"
\r
12040 #: ../source/TortoiseGit_en.xml:15325
\r
12042 msgid "If you use Diff from the main context menu, you are diffing a modified file against its BASE revision. The output from the CLI command above also does this and produces output in unified-diff format. However, this is not what TortoiseGit is using. TortoiseGit uses TortoiseMerge (or a diff program of your choosing) to display differences visually between full-text files, so there is no direct CLI equivalent."
\r
12045 #: ../source/TortoiseGit_en.xml:15334
\r
12047 msgid "You can also diff any 2 files using TortoiseGit, whether or not they are version controlled. TortoiseGit just feeds the two files into the chosen diff program and lets it work out where the differences lie."
\r
12050 #: ../source/TortoiseGit_en.xml:15343
\r
12053 msgid "\nsvn log -v -r 0:N --limit 100 [--stop-on-copy] PATH\n or\nsvn log -v -r M:N [--stop-on-copy] PATH\n"
\r
12056 #: ../source/TortoiseGit_en.xml:15348
\r
12058 msgid "By default, TortoiseGit tries to fetch 100 log messages using the --limit method. If the settings instruct it to use old APIs, then the second form is used to fetch the log messages for 100 repository revisions."
\r
12061 #: ../source/TortoiseGit_en.xml:15354
\r
12063 msgid "If <guilabel>Stop on copy/rename</guilabel> is checked, use the <literal>--stop-on-copy</literal> switch."
\r
12066 #: ../source/TortoiseGit_en.xml:15361
\r
12069 msgid "\nsvn status -v PATH\n or\nsvn status -u -v PATH\n"
\r
12072 #: ../source/TortoiseGit_en.xml:15366
\r
12074 msgid "The initial status check looks only at your working copy. If you click on <guibutton>Check repository</guibutton> then the repository is also checked to see which files would be changed by an update, which requires the <literal>-u</literal> switch."
\r
12077 #: ../source/TortoiseGit_en.xml:15383
\r
12079 msgid "Revision Graph"
\r
12082 #: ../source/TortoiseGit_en.xml:15384
\r
12084 msgid "The revision graph is a feature of TortoiseGit only. There's no equivalent in the command line client."
\r
12087 #: ../source/TortoiseGit_en.xml:15388
\r
12089 msgid "What TortoiseGit does is an <screen>\nsvn info URL_of_WC\nsvn log -v URL\n</screen> where URL is the repository <emphasis>root</emphasis> and then analyzes the data returned."
\r
12092 #: ../source/TortoiseGit_en.xml:15399
\r
12094 msgid "Repo Browser"
\r
12097 #: ../source/TortoiseGit_en.xml:15400
\r
12100 msgid "\nsvn info URL_of_WC\nsvn list [-r rev] -v URL\n"
\r
12103 #: ../source/TortoiseGit_en.xml:15404
\r
12105 msgid "You can use <literal>svn info</literal> to determine the repository root, which is the top level shown in the repository browser. You cannot navigate <literal>Up</literal> above this level. Also, this command returns all the locking information shown in the repository browser."
\r
12108 #: ../source/TortoiseGit_en.xml:15411
\r
12110 msgid "The <literal>svn list</literal> call will list the contents of a directory, given a URL and revision."
\r
12113 #: ../source/TortoiseGit_en.xml:15418
\r
12115 msgid "This command has no CLI equivalent. It invokes TortoiseMerge or an external 3-way diff/merge tool to look at the files involved in the conflict and sort out which lines to use."
\r
12118 #: ../source/TortoiseGit_en.xml:15425
\r
12123 #: ../source/TortoiseGit_en.xml:15426
\r
12126 msgid "\nsvn resolved PATH\n"
\r
12129 #: ../source/TortoiseGit_en.xml:15432
\r
12132 msgid "\nsvn rename CURR_PATH NEW_PATH\n"
\r
12135 #: ../source/TortoiseGit_en.xml:15438
\r
12138 msgid "\nsvn delete PATH\n"
\r
12141 #: ../source/TortoiseGit_en.xml:15447
\r
12143 msgid "The first stage is a status check which determines the items in your working copy which can potentially be reverted. You can review the list, diff files against BASE and select the items you want to be included in the revert."
\r
12146 #: ../source/TortoiseGit_en.xml:15453
\r
12148 msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (<literal>-R</literal>) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line."
\r
12151 #: ../source/TortoiseGit_en.xml:15460
\r
12154 msgid "\nsvn revert [-R] PATH...\n"
\r
12157 #: ../source/TortoiseGit_en.xml:15466
\r
12160 msgid "\nsvn cleanup PATH\n"
\r
12163 #: ../source/TortoiseGit_en.xml:15471
\r
12168 #: ../source/TortoiseGit_en.xml:15475
\r
12170 msgid "The first stage is a status check which determines the files in your working copy which can potentially be locked. You can select the items you want to be locked."
\r
12173 #: ../source/TortoiseGit_en.xml:15480
\r
12176 msgid "\nsvn lock -m \"LockMessage\" [--force] PATH...\n"
\r
12179 #: ../source/TortoiseGit_en.xml:15483
\r
12181 msgid "<literal>LockMessage</literal> here represents the contents of the lock message edit box. This can be empty."
\r
12184 #: ../source/TortoiseGit_en.xml:15487
\r
12186 msgid "If <guilabel>Steal the locks</guilabel> is checked, use the <literal>--force</literal> switch."
\r
12189 #: ../source/TortoiseGit_en.xml:15493
\r
12191 msgid "Release Lock"
\r
12194 #: ../source/TortoiseGit_en.xml:15494
\r
12197 msgid "\nsvn unlock PATH\n"
\r
12200 #: ../source/TortoiseGit_en.xml:15500
\r
12203 msgid "\nsvn copy -m \"LogMessage\" URL URL\n or\nsvn copy -m \"LogMessage\" URL@rev URL@rev\n or\nsvn copy -m \"LogMessage\" PATH URL\n"
\r
12206 #: ../source/TortoiseGit_en.xml:15512
\r
12208 msgid "Specific revision in repository"
\r
12211 #: ../source/TortoiseGit_en.xml:15507
\r
12213 msgid "The Branch/Tag dialog performs a copy to the repository. There are 3 radio button options: <placeholder-1/> which correspond to the 3 command line variants above."
\r
12216 #: ../source/TortoiseGit_en.xml:15524
\r
12219 msgid "\nsvn info URL_of_WC\nsvn switch [-r rev] URL PATH\n"
\r
12222 #: ../source/TortoiseGit_en.xml:15531
\r
12225 msgid "\nsvn merge [--dry-run] --force From_URL@revN To_URL@revM PATH\n"
\r
12228 #: ../source/TortoiseGit_en.xml:15534
\r
12230 msgid "The <guibutton>Test Merge</guibutton> performs the same merge with the <literal>--dry-run</literal> switch."
\r
12233 #: ../source/TortoiseGit_en.xml:15538
\r
12236 msgid "\nsvn diff From_URL@revN To_URL@revM\n"
\r
12239 #: ../source/TortoiseGit_en.xml:15541
\r
12241 msgid "The <guibutton>Unified diff</guibutton> shows the diff operation which will be used to do the merge."
\r
12244 #: ../source/TortoiseGit_en.xml:15548
\r
12247 msgid "\nsvn export [-r rev] [--ignore-externals] URL Export_PATH\n"
\r
12250 #: ../source/TortoiseGit_en.xml:15551
\r
12252 msgid "This form is used when accessed from an unversioned folder, and the folder is used as the destination."
\r
12255 #: ../source/TortoiseGit_en.xml:15555
\r
12257 msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent."
\r
12260 #: ../source/TortoiseGit_en.xml:15560
\r
12262 msgid "What TortoiseGit does is to copy all files to the new location while showing you the progress of the operation. Unversioned files/folders can optionally be exported too."
\r
12265 #: ../source/TortoiseGit_en.xml:15565
\r
12267 msgid "In both cases, if <guilabel>Omit externals</guilabel> is checked, use the <literal>--ignore-externals</literal> switch."
\r
12270 #: ../source/TortoiseGit_en.xml:15573
\r
12273 msgid "\nsvn switch --relocate From_URL To_URL\n"
\r
12276 #: ../source/TortoiseGit_en.xml:15578
\r
12278 msgid "Create Repository Here"
\r
12281 #: ../source/TortoiseGit_en.xml:15579
\r
12284 msgid "\nsvnadmin create --fs-type fsfs PATH\n"
\r
12287 #: ../source/TortoiseGit_en.xml:15588
\r
12289 msgid "If you selected a folder, TortoiseGit first scans it recursively for items which can be added."
\r
12292 #: ../source/TortoiseGit_en.xml:15595
\r
12295 msgid "\nsvn import -m LogMessage PATH URL\n"
\r
12298 #: ../source/TortoiseGit_en.xml:15605
\r
12301 msgid "\nsvn blame -r N:M -v PATH\nsvn log -r N:M PATH\n"
\r
12304 #: ../source/TortoiseGit_en.xml:15609
\r
12306 msgid "If you use TortoiseBlame to view the blame info, the file log is also required to show log messages in a tooltip. If you view blame as a text file, this information is not required."
\r
12309 #: ../source/TortoiseGit_en.xml:15617
\r
12311 msgid "Add to Ignore List"
\r
12314 #: ../source/TortoiseGit_en.xml:15618
\r
12317 msgid "\nsvn propget svn:ignore PATH > tempfile\n{edit new ignore item into tempfile}\nsvn propset svn:ignore -F tempfile PATH\n"
\r
12320 #: ../source/TortoiseGit_en.xml:15623
\r
12322 msgid "Because the <literal>svn:ignore</literal> property is often a multi-line value, it is shown here as being changed via a text file rather than directly on the command line."
\r
12325 #: ../source/TortoiseGit_en.xml:15631
\r
12328 msgid "\nsvn diff PATH > patch-file\n"
\r
12331 #: ../source/TortoiseGit_en.xml:15634
\r
12333 msgid "TortoiseGit creates a patch file in unified diff format by comparing the working copy with its BASE version."
\r
12336 #: ../source/TortoiseGit_en.xml:15641
\r
12338 msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git."
\r
12341 #: ../source/TortoiseGit_en.xml:15655
\r
12343 msgid "Implementation Details"
\r
12346 #: ../source/TortoiseGit_en.xml:15657
\r
12348 msgid "This appendix contains a more detailed discussion of the implementation of some of TortoiseGit's features."
\r
12351 #: ../source/TortoiseGit_en.xml:15665
\r
12353 msgid "overlay priority"
\r
12356 #: ../source/TortoiseGit_en.xml:15670
\r
12358 msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values."
\r
12361 #: ../source/TortoiseGit_en.xml:15678
\r
12363 msgid "<graphic fileref=\"images/ConflictIcon.png\"/> The <emphasis>Conflicted</emphasis> overlay is used to represent the <literal>conflicted</literal> state, where an update or switch results in conflicts between local changes and changes downloaded from the repository. It is also used to indicate the <literal>obstructed</literal> state, which can occur when an operation is unable to complete."
\r
12366 #: ../source/TortoiseGit_en.xml:15687
\r
12368 msgid "<graphic fileref=\"images/ModifiedIcon.png\"/> The <emphasis>Modified</emphasis> overlay represents the <literal>modified</literal> state, where you have made local modifications, the <literal>merged</literal> state, where changes from the repository have been merged with local changes, and the <literal>replaced</literal> state, where a file has been deleted and replaced by another different file with the same name."
\r
12371 #: ../source/TortoiseGit_en.xml:15697
\r
12373 msgid "<graphic fileref=\"images/DeletedIcon.png\"/> The <emphasis>Deleted</emphasis> overlay represents the <literal>deleted</literal> state, where an item is scheduled for deletion, or the <literal>missing</literal> state, where an item is not present. Naturally an item which is missing cannot have an overlay itself, but the parent folder can be marked if one of its child items is missing."
\r
12376 #: ../source/TortoiseGit_en.xml:15706
\r
12378 msgid "<graphic fileref=\"images/AddedIcon.png\"/> The <emphasis>Added</emphasis> overlay is simply used to represent the <literal>added</literal> status when an item has been added to version control."
\r
12381 #: ../source/TortoiseGit_en.xml:15712
\r
12383 msgid "<graphic fileref=\"images/InGitIcon.png\"/> The <emphasis>In Git</emphasis> overlay is used to represent an item which is in the <literal>normal</literal> state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates."
\r
12386 #: ../source/TortoiseGit_en.xml:15721
\r
12388 msgid "<graphic fileref=\"images/ReadOnlyIcon.png\"/> The <emphasis>Needs Lock</emphasis> overlay is used to indicate when a file has the <literal>svn:needs-lock</literal> property set. For working copies which were created using Git 1.4.0 and later, the <literal>svn:needs-lock</literal> status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the <literal>svn:needs-lock</literal> property may not happen until the file itself is updated."
\r
12391 #: ../source/TortoiseGit_en.xml:15735
\r
12393 msgid "<graphic fileref=\"images/LockedIcon.png\"/> The <emphasis>Locked</emphasis> overlay is used when the local working copy holds a lock for that file."
\r
12396 #: ../source/TortoiseGit_en.xml:15740
\r
12398 msgid "<graphic fileref=\"images/IgnoredIcon.png\"/> The <emphasis>Ignored</emphasis> overlay is used to represent an item which is in the <literal>ignored</literal> state, either due to a global ignore pattern, or the <literal>svn:ignore</literal> property of the parent folder. This overlay is optional."
\r
12401 #: ../source/TortoiseGit_en.xml:15748
\r
12403 msgid "<graphic fileref=\"images/UnversionedIcon.png\"/> The <emphasis>Unversioned</emphasis> overlay is used to represent an item which is in the <literal>unversioned</literal> state. This is an item in a versioned folder, but which is not under version control itself. This overlay is optional."
\r
12406 #: ../source/TortoiseGit_en.xml:15756
\r
12408 msgid "If an item has Git status <literal>none</literal> (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the <emphasis>Ignored</emphasis> and <emphasis>Unversioned</emphasis> overlays then no overlay will be shown for those files either."
\r
12411 #: ../source/TortoiseGit_en.xml:15763
\r
12413 msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case <literal>deleted</literal>. Those priorities are defined within Git itself."
\r
12416 #: ../source/TortoiseGit_en.xml:15770
\r
12418 msgid "When TortoiseGit displays the status recursively (the default setting), each folder displays an overlay reflecting its own status and the status of all its children. In order to display a single <emphasis>summary</emphasis> overlay, we use the priority order shown above to determine which overlay to use, with the <emphasis>Conflicted</emphasis> overlay taking highest priority."
\r
12421 #: ../source/TortoiseGit_en.xml:15779
\r
12423 msgid "In fact, you may find that not all of these icons are used on your system. This is because the number of overlays allowed by Windows is limited to 15. Windows uses 4 of those, and the remaining 11 can be used by other applications. If there are not enough overlay slots available, TortoiseGit tries to be a <quote>Good Citizen (TM)</quote> and limits its use of overlays to give other apps a chance."
\r
12426 #: ../source/TortoiseGit_en.xml:15790
\r
12428 msgid "<emphasis>Normal</emphasis>, <emphasis>Modified</emphasis> and <emphasis>Conflicted</emphasis> are always loaded and visible."
\r
12431 #: ../source/TortoiseGit_en.xml:15798
\r
12433 msgid "<emphasis>Deleted</emphasis> is loaded if possible, but falls back to <emphasis>Modified</emphasis> if there are not enough slots."
\r
12436 #: ../source/TortoiseGit_en.xml:15805
\r
12438 msgid "<emphasis>Read-Only</emphasis> is loaded if possible, but falls back to <emphasis>Normal</emphasis> if there are not enough slots."
\r
12441 #: ../source/TortoiseGit_en.xml:15812
\r
12443 msgid "<emphasis>Locked</emphasis> is only loaded if there are fewer than 13 overlays already loaded. It falls back to <emphasis>Normal</emphasis> if there are not enough slots."
\r
12446 #: ../source/TortoiseGit_en.xml:15820
\r
12448 msgid "<emphasis>Added</emphasis> is only loaded if there are fewer than 14 overlays already loaded. It falls back to <emphasis>Modified</emphasis> if there are not enough slots."
\r
12451 #: ../source/TortoiseGit_en.xml:15831
\r
12453 msgid "Securing Svnserve using SSH"
\r
12456 #: ../source/TortoiseGit_en.xml:15833
\r
12458 msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the <literal>svn+ssh</literal> protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user."
\r
12461 #: ../source/TortoiseGit_en.xml:15843
\r
12463 msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users."
\r
12466 #: ../source/TortoiseGit_en.xml:15848
\r
12468 msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should <emphasis>not</emphasis> start svnserve as a service or daemon when used with SSH."
\r
12471 #: ../source/TortoiseGit_en.xml:15854
\r
12473 msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at <ulink url=\"http://www.logemann.org/2007/03/13/Git-TortoiseGit-ssh-howto/\"><citetitle>www.logemann.org</citetitle></ulink> Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!"
\r
12476 #: ../source/TortoiseGit_en.xml:15865
\r
12478 msgid "Setting Up a Linux Server"
\r
12481 #: ../source/TortoiseGit_en.xml:15866
\r
12483 msgid "You need to have SSH enabled on the server, and here we assume that you will be using OpenSSH. On most distributions this will already be installed. To find out, type: <screen>\nps xa | grep sshd\n</screen> and look for ssh jobs."
\r
12486 #: ../source/TortoiseGit_en.xml:15875
\r
12488 msgid "One point to note is that if you build Git from source and do not provide any argument to <filename>./configure</filename>, Git creates a <filename>bin</filename> directory under <filename>/usr/local</filename> and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place <filename>/usr/local/bin</filename> into the <literal>PATH</literal> variable or create symbolic links of your binaries to the <filename>/usr/sbin</filename> directory, or to any other directory which is commonly in the <literal>PATH</literal>."
\r
12491 #: ../source/TortoiseGit_en.xml:15888
\r
12493 msgid "To check that everything is OK, login in as the target user with SSH and type: <screen>\nwhich svnserve\n</screen> This command should tell you if svnserve is reachable."
\r
12496 #: ../source/TortoiseGit_en.xml:15896
\r
12498 msgid "Create a new user which we will use to access the svn repository: <screen>\nuseradd -m svnuser\n</screen> Be sure to give this user full access rights to the repository."
\r
12501 #: ../source/TortoiseGit_en.xml:15905
\r
12503 msgid "Setting Up a Windows Server"
\r
12506 #: ../source/TortoiseGit_en.xml:15906
\r
12508 msgid "Install Cygwin SSH daemon as described here: <ulink url=\"http://pigtail.net/LRP/printsrv/cygwin-sshd.html\"><citetitle>http://pigtail.net/LRP/printsrv/cygwin-sshd.html</citetitle></ulink>"
\r
12511 #: ../source/TortoiseGit_en.xml:15912
\r
12513 msgid "Create a new Windows user account <literal>svnuser</literal> which we will use to access the repository. Be sure to give this user full access rights to the repository."
\r
12516 #: ../source/TortoiseGit_en.xml:15917
\r
12518 msgid "If there is no password file yet then create one from the Cygwin console using: <screen>\nmkpasswd -l > /etc/passwd\n</screen>"
\r
12521 #: ../source/TortoiseGit_en.xml:15925
\r
12523 msgid "SSH Client Tools for use with TortoiseGit"
\r
12526 #: ../source/TortoiseGit_en.xml:15926
\r
12528 msgid "Grab the tools we need for using SSH on the windows client from this site: <ulink url=\"http://www.chiark.greenend.org.uk/~sgtatham/putty/\"><citetitle>http://www.chiark.greenend.org.uk/~sgtatham/putty/</citetitle></ulink> Just go to the download section and get <filename>Putty</filename>, <filename>Plink</filename>, <filename>Pageant</filename> and <filename>Puttygen</filename>."
\r
12531 #: ../source/TortoiseGit_en.xml:15939
\r
12533 msgid "Creating OpenSSH Certificates"
\r
12536 #: ../source/TortoiseGit_en.xml:15940
\r
12538 msgid "The next step is to create a key pair for authentication. There are two possible ways to create keys. The first is to create the keys with PuTTYgen on the client, upload the public key to your server and use the private key with PuTTY. The other is to create the key pair with the OpenSSH tool ssh-keygen, download the private key to your client and convert the private key to a PuTTY-style private key."
\r
12541 #: ../source/TortoiseGit_en.xml:15950
\r
12543 msgid "Create Keys using ssh-keygen"
\r
12546 #: ../source/TortoiseGit_en.xml:15951
\r
12548 msgid "Login to the server as <literal>root</literal> or <literal>svnuser</literal> and type: <screen>\nssh-keygen -b 1024 -t dsa -N passphrase -f keyfile\n</screen> substituting a real pass-phrase (which only you know) and key file. We just created a SSH2 DSA key with 1024 bit key-phrase. If you type <screen>\nls -l keyfile*\n</screen> you will see two files, <filename>keyfile</filename> and <filename>keyfile.pub</filename>. As you might guess, the <filename>.pub</filename> file is the public key file, the other is the private one."
\r
12551 #: ../source/TortoiseGit_en.xml:15968
\r
12553 msgid "Append the public key to those in the <filename>.ssh</filename> folder within the <literal>svnuser</literal> home directory: <screen>\ncat keyfile.pub >> /home/svnuser/.ssh/authorized_keys\n</screen>"
\r
12556 #: ../source/TortoiseGit_en.xml:15975
\r
12558 msgid "In order to use the private key we generated, we have to convert it to a putty format. This is because the private key file format is not specified by a standards body. After you download the private key file to your client PC, start PuTTYgen and use <menuchoice><guimenu>Conversions</guimenu><guimenuitem>Import key</guimenuitem></menuchoice>. Browse to your file <filename>keyfile</filename> which you got from the server the passphrase you used when creating the key. Finally click on <guibutton>Save private key</guibutton> and save the file as <filename>keyfile.PPK</filename>."
\r
12561 #: ../source/TortoiseGit_en.xml:15992
\r
12563 msgid "Create Keys using PuTTYgen"
\r
12566 #: ../source/TortoiseGit_en.xml:15993
\r
12568 msgid "Use PuTTYgen to generate a public-key/private-key pair and save it. Copy the public key to the server and append it to those in the <filename>.ssh</filename> folder within the <literal>svnuser</literal> home directory: <screen>\ncat keyfile.pub >> /home/svnuser/.ssh/authorized_keys\n</screen>"
\r
12571 #: ../source/TortoiseGit_en.xml:16005
\r
12573 msgid "Test using PuTTY"
\r
12576 #: ../source/TortoiseGit_en.xml:16006
\r
12578 msgid "To test the connection we will use PuTTY. Start the program and on the <guilabel>Session</guilabel> tab set the hostname to the name or IP address of your server, the protocol to SSH and save the session as <literal>SvnConnection</literal> or whatever name you prefer. On the <guilabel>SSH</guilabel> tab set the preferred SSH protocol version to 2 and from <guilabel>Auth</guilabel> set the full path to the <literal>.PPK</literal> private key file you converted earlier. Go back to the <guilabel>Sessions</guilabel> tab and hit the <guilabel>Save</guilabel> button. You will now see <literal>SvnConnection</literal> in the list of saved sessions."
\r
12581 #: ../source/TortoiseGit_en.xml:16019
\r
12583 msgid "Click on <guilabel>Open</guilabel> and you should see a telnet style login prompt. Use <literal>svnuser</literal> as the user name and if all is well you should connect directly without being prompted for a password."
\r
12586 #: ../source/TortoiseGit_en.xml:16025
\r
12588 msgid "You may need to edit <filename>/etc/sshd_config</filename> on the server. Edit lines as follows and restart the SSH service afterwards. <screen>\nPubkeyAuthentication yes\nPasswordAuthentication no\nPermitEmptyPasswords no\nChallengeResponseAuthentication no\n</screen>"
\r
12591 #: ../source/TortoiseGit_en.xml:16037
\r
12593 msgid "Testing SSH with TortoiseGit"
\r
12596 #: ../source/TortoiseGit_en.xml:16038
\r
12598 msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify <filename>/home/svnuser/.ssh/authorized_keys</filename> as follows to allow many Git authors to use the same system account, <literal>svnuser</literal>. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author."
\r
12601 #: ../source/TortoiseGit_en.xml:16047
\r
12603 msgid "Note: This is all on one very long line. <screen>\ncommand=\"svnserve -t -r <ReposRootPath> --tunnel-user=<author>\",\n no-port-forwarding,no-agent-forwarding,no-X11-forwarding,\n no-pty ssh-rsa <PublicKey> <Comment>\n</screen> There are several values that you need to set according to your setup."
\r
12606 #: ../source/TortoiseGit_en.xml:16056
\r
12608 msgid "<literal><ReposRootPath></literal> should be replaced with the path to the directory containing your repositories. This avoids the need to specify full server paths within URLs. Note that you must use forward slashes even on a Windows server, e.g. <filename>c:/svn/reposroot</filename>. In the examples below we assume that you have a repository folder within the repository root called <filename>repos</filename>."
\r
12611 #: ../source/TortoiseGit_en.xml:16065
\r
12613 msgid "<literal><author></literal> should be replaced with the svn author that you want to be stored on commit. This also allows svnserve to use its own access rights within <filename>svnserve.conf</filename>."
\r
12616 #: ../source/TortoiseGit_en.xml:16070
\r
12618 msgid "<literal><PublicKey></literal> should be replaced with the public key that you generated earlier."
\r
12621 #: ../source/TortoiseGit_en.xml:16074
\r
12623 msgid "<literal><Comment></literal> can be any comment you like, but it is useful for mapping an svn author name to the person's real name."
\r
12626 #: ../source/TortoiseGit_en.xml:16078
\r
12628 msgid "Right click on any folder in Windows Explorer and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Repo-Browser</guimenuitem></menuchoice>. You will be prompted to enter a URL, so enter one in this form: <screen>\nsvn+ssh://svnuser@SvnConnection/repos\n</screen> What does this URL mean? The Schema name is <literal>svn+ssh</literal> which tells TortoiseGit how to handle the requests to the server. After the double slash, you specify the user to connect to the server, in our case <literal>svnuser</literal>. After the <literal>@</literal> we supply our PuTTY session name. This session name contains all details like where to find the private key and the server's IP or DNS. Lastly we have to provide the path to the repository, relative to the repository root on the server, as specified in the <filename>authorized_keys</filename> file."
\r
12631 #: ../source/TortoiseGit_en.xml:16098
\r
12633 msgid "Click on <guibutton>OK</guibutton> and you should be able to browse the repository content. If so you now have a running SSH tunnel in conjunction with TortoiseGit."
\r
12636 #: ../source/TortoiseGit_en.xml:16103
\r
12638 msgid "Note that by default TortoiseGit uses its own version of Plink to connect. This avoids a console window popping up for every authentication attempt, but it also means that there is nowhere for error messages to appear. If you receive the error <quote>Unable to write to standard output</quote>, you can try specifying Plink as the client in TortoiseGit's network settings. This will allow you to see the real error message generated by Plink."
\r
12641 #: ../source/TortoiseGit_en.xml:16113
\r
12643 msgid "SSH Configuration Variants"
\r
12646 #: ../source/TortoiseGit_en.xml:16114
\r
12648 msgid "One way to simplify the URL in TortoiseGit is to set the user inside the PuTTY session. For this you have to load your already defined session <literal>SvnConnection</literal> in PuTTY and in the <guilabel>Connection</guilabel> tab set <guilabel>Auto login user</guilabel> to the user name, e.g. <literal>svnuser</literal>. Save your PuTTY session as before and try the following URL inside TortoiseGit: <screen>\nsvn+ssh://SvnConnection/repos\n</screen> This time we only provide the PuTTY session <literal>SvnConnection</literal> to the SSH client TortoiseGit uses (TortoisePlink.exe). This client will check the session for all necessary details."
\r
12651 #: ../source/TortoiseGit_en.xml:16129
\r
12653 msgid "At the time of writing PuTTY does not check all saved configurations, so if you have multiple configurations with the same server name, it will pick the first one which matches. Also, if you edit the default configuration and save it, the auto login user name is <emphasis>not</emphasis> saved."
\r
12656 #: ../source/TortoiseGit_en.xml:16136
\r
12658 msgid "Many people like to use Pageant for storing all their keys. Because a PuTTY session is capable of storing a key, you don't always need Pageant. But imagine you want to store keys for several different servers; in that case you would have to edit the PuTTY session over and over again, depending on the server you are trying to connect with. In this situation Pageant makes perfect sense, because when PuTTY, Plink, TortoisePlink or any other PuTTY-based tool is trying to connect to an SSH server, it checks all private keys that Pageant holds to initiate the connection."
\r
12661 #: ../source/TortoiseGit_en.xml:16147
\r
12663 msgid "For this task, simply run Pageant and add the private key. It should be the same private key you defined in the PuTTY session above. If you use Pageant for private key storage, you can delete the reference to the private key file in your saved PuTTY session. You can add more keys for other servers, or other users of course."
\r
12666 #: ../source/TortoiseGit_en.xml:16154
\r
12668 msgid "If you don't want to repeat this procedure after every reboot of your client, you should place Pageant in the auto-start group of your Windows installation. You can append the keys with complete paths as command line arguments to Pageant.exe"
\r
12671 #: ../source/TortoiseGit_en.xml:16160
\r
12673 msgid "The last way to connect to an SSH server is simply by using this URL inside TortoiseGit: <screen>\nsvn+ssh://svnuser@100.101.102.103/repos\nsvn+ssh://svnuser@mydomain.com/repos\n</screen> As you can see, we don't use a saved PuTTY session but an IP address (or domain name) as the connection target. We also supply the user, but you might ask how the private key file will be found. Because TortoisePlink.exe is just a modified version of the standard Plink tool from the PuTTY suite, TortoiseGit will also try all the keys stored in Pageant."
\r
12676 #: ../source/TortoiseGit_en.xml:16174
\r
12678 msgid "If you use this last method, be sure you do not have a default username set in PuTTY. We have had reports of a bug in PuTTY causing connections to close in this case. To remove the default user, simply clear <filename>HKEY_CURRENT_USER\\Software\\SimonTatham\\Putty\\Sessions\\Default%20Settings\\HostName</filename>"
\r
12681 #: ../source/TortoiseGit_en.xml:16186
\r
12686 #: ../source/TortoiseGit_en.xml:16190
\r
12688 msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit."
\r
12691 #: ../source/TortoiseGit_en.xml:16198
\r
12693 msgid "BASE revision"
\r
12696 #: ../source/TortoiseGit_en.xml:16200
\r
12698 msgid "The current base revision of a file or folder in your <emphasis>working copy</emphasis>. This is the revision the file or folder was in, when the last checkout, update or commit was run. The BASE revision is normally not equal to the HEAD revision."
\r
12701 #: ../source/TortoiseGit_en.xml:16211
\r
12703 msgid "This command is for text files only, and it annotates every line to show the repository revision in which it was last changed, and the author who made that change. Our GUI implementation is called TortoiseBlame and it also shows the commit date/time and the log message when you hover the mouse of the revision number."
\r
12706 #: ../source/TortoiseGit_en.xml:16221
\r
12711 #: ../source/TortoiseGit_en.xml:16223
\r
12713 msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories."
\r
12716 #: ../source/TortoiseGit_en.xml:16230
\r
12721 #: ../source/TortoiseGit_en.xml:16232
\r
12723 msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a <quote>cheap copy</quote>."
\r
12726 #: ../source/TortoiseGit_en.xml:16247
\r
12728 msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository."
\r
12731 #: ../source/TortoiseGit_en.xml:16256
\r
12733 msgid "To quote from the Git book: <quote> Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a <emphasis>working copy locked</emphasis> error, run this command to remove stale locks and get your working copy into a usable state again. </quote> Note that in this context <emphasis>lock</emphasis> refers to local filesystem locking, not repository locking."
\r
12736 #: ../source/TortoiseGit_en.xml:16273
\r
12738 msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision."
\r
12741 #: ../source/TortoiseGit_en.xml:16281
\r
12746 #: ../source/TortoiseGit_en.xml:16283
\r
12748 msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes."
\r
12751 #: ../source/TortoiseGit_en.xml:16293
\r
12756 #: ../source/TortoiseGit_en.xml:16295
\r
12758 msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as <quote>cheap copies</quote> which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made."
\r
12761 #: ../source/TortoiseGit_en.xml:16307
\r
12763 msgid "When you delete a versioned item (and commit the change) the item no longer exists in the repository after the committed revision. But of course it still exists in earlier repository revisions, so you can still access it. If necessary, you can copy a deleted item and <quote>resurrect</quote> it complete with history."
\r
12766 #: ../source/TortoiseGit_en.xml:16319
\r
12768 msgid "Shorthand for <quote>Show Differences</quote>. Very useful when you want to see exactly what changes have been made."
\r
12771 #: ../source/TortoiseGit_en.xml:16328
\r
12773 msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local <literal>.svn</literal> folders."
\r
12776 #: ../source/TortoiseGit_en.xml:16336
\r
12781 #: ../source/TortoiseGit_en.xml:16338
\r
12783 msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories."
\r
12786 #: ../source/TortoiseGit_en.xml:16347
\r
12788 msgid "Group policy object"
\r
12791 #: ../source/TortoiseGit_en.xml:16353
\r
12793 msgid "HEAD revision"
\r
12796 #: ../source/TortoiseGit_en.xml:16355
\r
12798 msgid "The latest revision of a file or folder in the <emphasis>repository</emphasis>."
\r
12801 #: ../source/TortoiseGit_en.xml:16363
\r
12803 msgid "Git command to import an entire folder hierarchy into the repository in a single revision."
\r
12806 #: ../source/TortoiseGit_en.xml:16372
\r
12808 msgid "When you take out a lock on a versioned item, you mark it in the repository as non-committable, except from the working copy where the lock was taken out."
\r
12811 #: ../source/TortoiseGit_en.xml:16380
\r
12816 #: ../source/TortoiseGit_en.xml:16382
\r
12818 msgid "Show the revision history of a file or folder. Also known as <quote>History</quote>."
\r
12821 #: ../source/TortoiseGit_en.xml:16389
\r
12826 #: ../source/TortoiseGit_en.xml:16391
\r
12828 msgid "Show the revision history of a file or folder. Also known as <quote>Log</quote>."
\r
12831 #: ../source/TortoiseGit_en.xml:16400
\r
12833 msgid "The process by which changes from the repository are added to your working copy without disrupting any changes you have already made locally. Sometimes these changes cannot be reconciled automatically and the working copy is said to be in conflict."
\r
12836 #: ../source/TortoiseGit_en.xml:16406
\r
12838 msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseGit's Merge command."
\r
12841 #: ../source/TortoiseGit_en.xml:16414
\r
12846 #: ../source/TortoiseGit_en.xml:16416
\r
12848 msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a <quote>Patch</quote>, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review."
\r
12851 #: ../source/TortoiseGit_en.xml:16429
\r
12856 #: ../source/TortoiseGit_en.xml:16431
\r
12858 msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as <quote>properties</quote> to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as <literal>svn:eol-style</literal>. TortoiseGit has some too, such as <literal>tsvn:logminsize</literal>. You can add your own properties with any name and value you choose."
\r
12861 #: ../source/TortoiseGit_en.xml:16446
\r
12863 msgid "If your repository moves, perhaps because you have moved it to a different directory on your server, or the server domain name has changed, you need to <quote>relocate</quote> your working copy so that its repository URLs point to the new location."
\r
12866 #: ../source/TortoiseGit_en.xml:16452
\r
12868 msgid "Note: you should only use this command if your working copy is referring to the same location in the same repository, but the repository itself has moved. In any other circumstance you probably need the <quote>Switch</quote> command instead."
\r
12871 #: ../source/TortoiseGit_en.xml:16461
\r
12873 msgid "Repository"
\r
12876 #: ../source/TortoiseGit_en.xml:16463
\r
12878 msgid "A repository is a central place where data is stored and maintained. A repository can be a place where multiple databases or files are located for distribution over a network, or a repository can be a location that is directly accessible to the user without having to travel across a network."
\r
12881 #: ../source/TortoiseGit_en.xml:16474
\r
12883 msgid "When files in a working copy are left in a conflicted state following a merge, those conflicts must be sorted out by a human using an editor (or perhaps TortoiseMerge). This process is referred to as <quote>Resolving Conflicts</quote>. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed."
\r
12886 #: ../source/TortoiseGit_en.xml:16486
\r
12888 msgid "Git keeps a local <quote>pristine</quote> copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the <quote>revert</quote> command to go back to the pristine copy."
\r
12891 #: ../source/TortoiseGit_en.xml:16495
\r
12896 #: ../source/TortoiseGit_en.xml:16497
\r
12898 msgid "Every time you commit a set of changes, you create one new <quote>revision</quote> in the repository. Each revision represents the state of the repository tree at a certain point in its history. If you want to go back in time you can examine the repository as it was at revision N."
\r
12901 #: ../source/TortoiseGit_en.xml:16504
\r
12903 msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created."
\r
12906 #: ../source/TortoiseGit_en.xml:16511
\r
12908 msgid "Revision Property (revprop)"
\r
12911 #: ../source/TortoiseGit_en.xml:16513
\r
12913 msgid "Just as files can have properties, so can each revision in the repository. Some special revprops are added automatically when the revision is created, namely: <literal>svn:date svn:author svn:log</literal> which represent the commit date/time, the committer and the log message respectively. These properties can be edited, but they are not versioned, so any change is permanent and cannot be undone."
\r
12916 #: ../source/TortoiseGit_en.xml:16525
\r
12921 #: ../source/TortoiseGit_en.xml:16527
\r
12923 msgid "A frequently-used abbreviation for Git."
\r
12926 #: ../source/TortoiseGit_en.xml:16530
\r
12928 msgid "The name of the Git custom protocol used by the <quote>svnserve</quote> repository server."
\r
12931 #: ../source/TortoiseGit_en.xml:16539
\r
12933 msgid "Just as <quote>Update-to-revision</quote> changes the time window of a working copy to look at a different point in history, so <quote>Switch</quote> changes the space window of a working copy so that it points to a different part of the repository. It is particularly useful when working on trunk and branches where only a few files differ. You can switch your working copy between the two and only the changed files will be transferred."
\r
12936 #: ../source/TortoiseGit_en.xml:16553
\r
12938 msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy."
\r
12941 #: ../source/TortoiseGit_en.xml:16561
\r
12943 msgid "Working Copy"
\r
12946 #: ../source/TortoiseGit_en.xml:16563
\r
12948 msgid "This is your local <quote>sandbox</quote>, the area where you work on the versioned files, and it normally resides on your local hard disk. You create a working copy by doing a <quote>Checkout</quote> from a repository, and you feed your changes back into the repository using <quote>Commit</quote>."
\r
12951 #. Put one translator per line, in the form of NAME <EMAIL>.
\r
12952 #: ../source/TortoiseGit_en.xml:0
\r
12954 msgid "translator-credits"
\r
12957 #. Place the translation of 'translation' here.
\r
12958 #: ../source/TortoiseGit_en.xml:0
\r
12960 msgid "translator-translation"
\r
OSDN Git Service
