TortoiseMerge User Manual - UI Enterprise Applications
Contents
1. Recursively clean up the working copy removing locks and resuming unfinished operations If you ever get a working copy locked error run this command to remove stale locks and get your working copy into a usable state again Note that in this context lock refers to local filesystem locking not repository locking This Subversion command is used to pass the changes in your local working copy back into the repository creating a new repository revision When changes from the repository are merged with local changes sometimes those changes occur on the same lines In this case Subversion 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 In a Subversion repository you can create a copy of a single file or an entire tree These are implemented as cheap copies 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 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 resurrect 1t complete with history 18 Glossary Diff2. Delete A Subversion 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 The current base revision of a file or folder in your working copy 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 Berkeley DB A well tested database backend for repositories that cannot be used on network shares Default for pre 1 2 repositories 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 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 Subversion a branch is implemented as a cheap copy A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository To quote from the Subversion book
3. OA SHGetFileInfo FILE ATTRIBUTE D IRECTORY amp sfi sizeof sfi return sfi ilcon 66 int CSysImageList GetDefaultIconIndex const SHFILEINFO sfi ZeroMemory ssfi sizeof sfi SHGetFileInfo id FILE ATTRIBUTE DIRECTORY amp sfi sizeof sfi SHGFI SYSICONINDEX SHGFI_ USEFILEATTRIB return sfi ilcon 69 int CSysImageList GetDefaultIconIndex const 70 71 SHFILEINFO sfi ZeroMemory sfi sizeof sfi FILE_ATTRIBUTE_DIRECTORY FILE ATTRIBUTE DIRECTORY For Help press F1 Scroll horizontally with Ctrl Scrollwheel Figure 3 2 Two Pane View The two pane view has some features which are not available in the one pane view Changes inside the modified lines are shown in different colors Added string parts are shown with a lighter color but you can of course configure the colors used here Removed parts are indicated with a dark brown vertical line in the string Check out the screenshot above to see how this works Code reorganization usually means a lot of changes in whitespaces space tab newlines but no actual code change For example you split up a very long line into several lines or you sometimes compact several lines together into one Such changes are marked with a white circle symbol on the left side of the views If you see such a white circle you know immediately that no real code change is there and you don t have to check the changed block
4. Export FSFS GPO HEAD revision History Import Lock Merge Patch Property Relocate Shorthand for Show Differences Very useful when you want to see exactly what changes have been made This command produces a copy of a versioned folder just like a working copy but without the local svn folders A proprietary Subversion filesystem backend for repositories Can be used on network shares Default for 1 2 and newer repositories Group policy object The latest revision of a file or folder in the repository Show the revision history of a file or folder Also known as Log Subversion command to import an entire folder hierarchy into the repository in a single revision 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 Show the revision history of a file or folder Also known as History 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 Merging happens automatically when you update your working copy You can also merge specific changes from another branch using TortoiseS VN s Merge command If a working copy has changes to text files only it is possible to use Subversion s Diff command to gene
5. Where lines have been added in the opposite pane and no such line existed in this pane Inline added text When inline diffs are shown added text is shown in this colour Inline removed text When inline diffs are shown deleted text is shown in this colour Misc whitespaces Characters used to indicate Whitespace are shown in a different colour from normal text 14 Appendix A keyboard shortcuts List of keyboard shortcuts and commands A 1 Keyboard shortcuts Ctrl Q Quit the program Ctrl C Copy the selected text to the clipboard Ctrl F Open the Find dialog for text searches Ctrl O Open files to diff merge Ctrl S Save the changes Ctrl Shift S Save as F7 Go to next difference Shift F7 Go to previous difference F8 Go to next conflict Shift F8 Go to previous conflict Ctrl D Toggle between one pane diff and two pane diff Ctrl R Reload the files and revert all changes made Ctrl T Toggles between showing whitespaces or not Ctrl mousewheel Scroll the display left right 15 Appendix B Automating TortoiseMerge TortoiseMerge can be started with command line parameters to avoid having to go through the Open dialog to select the files yourself This is useful also if you want to use TortoiseMerge from another application B 1 TortoiseMerge Command Line Switches Most switches require additional information like a path or some other string In those cases append an to the s
6. 1 1 File Conflict A conflict can also occur if you try to apply an outdated patch file In such cases without TortoiseMerge you would either have to ask the person you got that patch file from for a current version or try to apply that patch file manually But now with TortoiseMerge this isn t necessary anymore at least not if you re working with a version control system like Subversion TortoiseMerge parses the patch file for the revision version the patch was created for and automatically tries to fetch that specific version from your source control Then it applies the patch and lets you review both your changes to the file and theirs Then you can decide which changes you want to keep Introduction 1 2 TortoiseMerge s History While working on TortoiseSVN http tortoisesvn tigris org we found that whenever users sent in patches to enhance the project or just to fix bugs we had a lot of work just applying those patches And many times those patches were outdated and couldn t be applied with the command line patch tool http unxutils sourceforge net http unxutils sourceforge net because we were working on those files and had sometimes changed those files already This was also the main reason why TortoiseSVN did not originally have a TortoiseSVN Create Patch implemented we preferred users to send us the whole files because with those it was easier to apply patches So we spent a lot of time searching the Intern
7. and conflicts Mark as Resolved When you have resolved all the conflicts in a file and saved the changes you can mark it as resolved from within TortoiseMerge rather than going back to explorer and marking as resolved from there Show Whitespaces toggles the option to display space and tab characters as symbols so you can distinguish white space changes Inline Diff Word wise toggles the method used to display inline diffs In word wise mode when a Character is changed the whole word is highlighted In char wise mode each individual changed character is highlighted Word wise is the default and in most cases it works better For example if you change a variable name the whole name is highlighted in word wise mode whereas in char wise mode you tend to get a mess of added and deleted characters which doesn t make much sense However some content does not resolve neatly into words for example a hex file and in that case char wise display works better Switch View selects between one pane and two pane view Disabled in 3 pane view Switch Left and Right View In 2 pane view swaps the left and right windows When you are comparing a file in 2 different trees as opposed to 2 revisions of the same file TortoiseSVN does not know which one should go in the left pane as the original base version If it gets this wrong you can change it to make viewing easier Show Hide Patch List When TortoiseMerge has a patch list this button allow
8. based changes described above it is better to do those first since once you start editing the file yourself 1t becomes impossible for TortoiseMerge to keep track of the relationship to the original files 2 2 Editing Conflicts This is sometimes referred to as a three way merge and is shown in three panes However there are actually four files involved The file which is not shown is the common base file the last common ancestor of the two files which are now in conflict The relationships between the three files are explained in the diagram below Basic Concepts Time conflict S ifl Figure 2 1 File Conflict The base file represents the oldest version of a file from where You and They start making changes Mine represents the base file with all the changes you made and Theirs is the file with all the changes someone else made to the file The left pane shows the changes in Theirs relative to the base file and the right pane shows the changes in Mine relative to the base file The bottom pane is the output file which is where you are trying to resolve the conflicts In conflict resolution view you can choose to use blocks from Mine or Theirs or both But in this case the changes are shown in the bottom pane 2 3 Applying Patches A patch file is a Subversion unified diff file which contains the information required to apply changes to a set of files The patch may have been supplied by another developer so that y
9. further Hand editing of the file in the right pane is possible in two pane view Such changes are marked with a pencil symbol If you want to compare merge three files TortoiseMerge will show you the differences in a three pane view This view is also used if you need to resolve conflicted files Using TortoiseMerge Y Schiller s Glocke TortoiseMerge File Edi Navigate View Help DU 89 14833 Theirs Schiller s Glocke Mine Schiller s Glocke 3 4 Festgemauert in der Erden 4 Festgemauert in der Erden 53teht die Form aus Lehm gebrannt m athi 5Steht die Form aus Lehm gebrannt Haure pub die classe werden 6 Heute mu die Glocke werden 6 Heute mu die Glocke werden 7 Frisch Gesellen seid zur Hand 7 Frisch Gesellen seid zur Hand Van dero SL rpa heii 7 Frisch Gesellen seid zur Hand x i Sti ERU Rinnenceub der Zehueddy al daa Merk den Meister eben p 8 Mo cu deu uei gt UTF 16LE CRLF j 227 22 Right Vi i Figure 3 3 Three Pane View The left pane shows you the differences between Their file and the Base file while the right pane shows you the differences between Mine file and the Base file The bottom pane shows you the result of merging Base Mine and Theirs with possible conflicts If you hover the mouse over the pane title a tooltip will show the filenames used for the diff in each pane 3 1 2 Applying Patches After TortoiseMerge parses the patch
10. iere re OS RE ERRARE ER 13 A keyboard shortcuts voii dei 15 A1 Keyboard SA ei sehe Ele 15 B Automating TortoiseMerge sssssssssss Ie n ent ent entem nen nennen 16 B 1 TortoiseMerge Command Line Switches ocoocccoccnnccnnconnconoconnconnconoconocnnccnorcninnnn 16 GIOSSALY PH R M 18 111 List of Figures Lr Pile Contlict taa iii tad ee en ea ee 1 Dl FIle Conti A ERS Tan ee EE et e Ea 4 Sel One Pe Ni ems cor EO erbe EP ee ersehen 5 3 2 TwouPane View dei 6 3 3 Three Pane VIEW nen as om ore Da talus be IA s Uo Tash pacha Daa wee ee ee 7 3 4 Patch File Tast rn A Eli e eie eas Bets SS EE SONOS 8 O Toolbar Mrs er ne EE 8 3 6 The Open Dialog use sine ele ge nt 11 3 1 The Settings Main Page eret partit IE Re 12 3 8 The Settings Color Page eed osteo na seen 13 List of Tables B 1 List of available command line options Preface a e Ao When working on a project either an open source project where several people review your code or a commercial project where you sell a component with your source code there will be people and customers who find bugs or want to improve your project To do that they send you patches which you have to review and decide if you want to apply them TortoiseMerge helps you with both those tasks Reviewing patches Applying the patches TortoiseMerge also helps you to sort out conflicted files which can occur if
11. TortoiseMerge A diff merge tool for Windows Version 1 6 6 Stefan K ng L bbe Onken Simon Large TortoiseMerge A diff merge tool for Windows Version 1 6 6 by Stefan K ng L bbe Onken and Simon Large Published 2009 08 31 01 13 53 r17052 Table of Contents Preface noted taa ei ine gebe vi 1 TortoiseMerge 1s Tree iss BE ET ER BER sts IHR ED ren vi 2 Acknowledsments Sense Rer EE IR PR SPR prime RE FERRE ET pie ee vi 1 Introductions hein e P eme PN EUH IIR HE 1 INNO T MD PEUT 1 1 2 TortoiseMerge s History eter verset As 2 2 Basic Concepts ou neon erre ee niemals re esse IET geese seas na neta dase 3 2 1 Viewing and Merging Differences 222442444s40 ssnnnennsen em emm emere 3 2 2 Editing Conflicts minis UR rere pee eie ie EM 3 2 3 Applying Patches coi s 4 3 Using Tort iseMerse ccoo prm mr eH EE rr Pera eire rentpe iberhens 5 3 1 Viewing Modes siii EID REIS REIR ERU UI aes 5 3 1 1 Viewing Merging ette rr ett Are Bun 5 3 1 2 Applymg Patches u esce tte aa stets rn ye cee 7 3 2 Buttons and Other Controls esee Bestehen es 8 3 3 Line Status ICONS ui eds 9 3 4 Merging Editing Conflicts zus nee pe 10 3 5 Open Files s 2 2 os ini A AS e thet use 11 35 1 Viewing Merging iiia cedet ERR HERR ods caos 11 3 5 2 Applymg Patches esae eee rentre tiep rt Ree 11 RON dun M EEUU 12 3 6 1 Main Settings Page nu 2 we rasen EI e e nen 12 3 6 2 Colour Settings Paper
12. al The name of the original file to patch Used for the view title patchpatched The name of the resulting patched file Used for the view title diff The path to the patch diff file to apply to a directory oneway Forces TortoiseMerge to start with the one way view instead of the view the user specified in the settings reversedpatch Switches the left and right view of the specified two files to diff createunifieddiff Creates a unified diff file patch file of two files specified with origfile path_to_original_file and modifiedfile path_to_modified_file The target path is 16 Automating TortoiseMerge Command Description set with outfile path_to_resulting_patchfile If out file is not set a file save dialog is shown so the user can choose the location to save the patch file Note If createunifieddi ff is set all other parameters are ignored Table B 1 List of available command line options You can also supply simple filenames on the command line for compatibility with other diff programs In this simplified form the command line is TortoiseMerge BaseFilePath MyFilePath TheirFilePath If two files are given they will be compared with each other If three files are given the first is taken as the BASE file and the other two are compared with it in a three way diff 17 Glossary Add BASE revision BDB Blame Branch Checkout Cleanup Commit Conflict Copy
13. amp A line has been edited by hand using TortoiseMerge as a text editor This line is in conflict This line is conflicted but the effect is hidden by whitespace or line ending settings 3 4 Merging Editing Conflicts TortoiseMerge not only shows you the differences between files but also lets you resolve conflicts or apply changes If you re in two pane view then you can only edit the file in the right pane Mine To apply changes made in the left file Theirs right click on the changed lines and select Context Menu gt Use text block from theirs Then the changes from the left file are added to the right file Sometimes you actually want both text blocks and the context menu also offers you Context Menu gt Use both text blocks this one first and Context Menu gt Use both text blocks this one last You can also edit the output file just as you would in a text editor Such lines are marked using a pencil icon Please note that if you want to make any of the line block based changes described above it is better to do those first since once you start editing the file yourself it becomes impossible for TortoiseMerge to keep track of the relationship to the original files If you re in three pane view sometimes called merge view you can only edit the file in the bottom view Merged As in two pane view you can right click on conflicted lines and either select Context Menu gt Use text block from theirs or Cont
14. et for a GUI tool which could apply patch files but all we found was that such a tool didn t exist So to cut a long story short We decided that if no one else could provide such a tool we would have to write our own That s when TortoiseMerge was born Since TortoiseSVN already uses the Subversion library which has a nice diffing engine built in it was just natural to use this library instead of the GNU diff Chapter 2 Basic Concepts TortoiseMerge has several different uses e Viewing the difference between two files and merging changes into one of them or removing unwanted changes Editing conflicts between local changes and changes in the Subversion repository following an update Applying patch files This is the reason TortoiseMerge was created 2 1 Viewing and Merging Differences In this mode you are comparing two files The file in the left pane is considered to be the original file sometimes referred to as Theirs and the file in the right pane is the modified file sometimes referred to as Mine You can make simple line based changes to the file in the right pane which include Reverting changed lines back to the text shown in the left pane Using a combination of both blocks either Theirs before Mine or Mine before Theirs You can also edit the file in the right pane just as you would in a text editor Such lines are marked using a pencil icon Please note that if you want to make any of the line block
15. ext Menu gt Use text block from mine In addition if you want both blocks you can select Context Menu Use text block from mine before theirs or Context Menu Use text block from theirs before mine According to the command you ve selected the changes are used in the resulting Merged file Sometimes a file will be marked as conflicted in Subversion yet when you view it using TortoiseMerge there are no conflicts shown This may be due to the whitespace handling you have chosen If you choose to ignore line endings or whitespace changes those lines will be marked using the Conflict Ignored icon To resolve the conflict you still need to pick which version you want to use Sometimes the conflict is too difficult to resolve by simply picking Theirs and Mine and it requires hand editing TortoiseMerge allows you to do all the easy changes visually first and then save the file leaving only the difficult changes to be resolved by hand editing 10 Using TortoiseMerge 1 Important Note that if you use TortoiseMerge on the same files again any changes to your working copy whether in TortoiseMerge or by hand editing will be discarded and the file will appear as it did when conflict editing first started 3 5 Open Files When you start TortoiseMerge without any command line switches then you have to open the files manually using File Open TortoiseMerge Merging Apply unified diff Mergi
16. file it will show you a small window with all the files which have changes according to the patch file Using TortoiseMerge File patches C Torto source X 2 dug blame xml ke dug_bugtracker xml ES dug cleanup xml Ei dug_diff xml ej dug merge xml 2 dug propertypage xml E dug settings xml Preview patched file Patch all NETS Figure 3 4 Patch File List If the filename is shown in black then the patch can be applied without any problems That means the file is not outdated according to the patch However if the filename is shown in red then the patch can t get applied directly because you already changed that file But don t worry If you re working with Subversion you can retrieve an older version of the file and resolve the conflict In fact TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base the older version of the file Mine the file as it is currently in your working copy and Theirs the older version of the file with the patch already applied Then you can resolve possible conflicts manually The patch file window has a context menu which allows you to preview the effect of the patch on the current file apply without saving to apply and save the changes for the selected file or to apply and save changes to all files in the list The double click action is to preview Depending on whether TortoiseMerge can apply the patch direct
17. gnore whitespace changes hides 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 Ignore all whitespaces hides all whitespace only changes 3 6 2 Colour Settings Page Settings General Colors Line differences Normal Added Removed Modified Conflicted Conflict resolved Empty Inline differences Added Removed ALT Whitespaces Figure 3 8 The Settings Color Page This dialog allows you to select the background color coding used to highlight the different line changes Normal All lines which are unchanged or where changes are hidden Added Lines which have been added Removed Lines which have been deleted Modified Lines which have relatively small changes and are shown using inline diff This colour is used for the unchanged portion of the line content Changed portions will be shown using the inline added and deleted colours described below If Colour code in line changes is not enabled this colour will not be used and changed lines will always be shown as replacements 13 Using TortoiseMerge Conflicted Where the same line has been changed in both files Conflict resolved Where the same line has been changed in both files and you have now selected which version should be used Empty
18. ly or by fetching an older version of the file first it shows you a two pane view patch can be applied directly or a three pane view older version of file fetched 3 2 Buttons and Other Controls HEOR Vad 6964 12 84 Figure 3 5 The Toolbar Below the menu bar lies the tool bar This provides easy access to the most commonly used tools which are Open accesses the file open dialog What else Save saves any changes you have made Reload discards any changes you have made in TortoiseMerge and reloads the files from disk Using TortoiseMerge Undo implements a multi level undo allowing you to reverse any changes you have made within TortoiseMerge Prev Next Difference jumps directly to the next point where the files differ This saves scrolling through all the unchanged parts of the file When you do this in 2 pane diff mode the detail bar at the bottom of the screen will show you the inline differences for the first line regardless of where the mouse is hovering Prev Next Conflict jumps directly to the next point where the file differences are in conflict and need to be resolved Use Theirs Use Mine selects whether to use a block from the left or the right pane Refer to the next section for more information about editing changes and conflicts Theirs before Mine Mine before Theirs is used when you want to combine changes in a conflicted file Refer to the next section for more information about editing changes
19. ng Base fle Their File Browse Browse My File Apply unified diff Diff File Directory Figure 3 6 The Open Dialog The first thing you have to do is to decide whether you just want to compare merge files or whether you want to apply a patch file Depending on what you choose the corresponding edit boxes and browse buttons are activated 3 5 1 Viewing Merging If you want to compare merge files you have to set at least two of the three possible paths for Base Mine and Theirs If you select only two files then TortoiseMerge will show you the differences between those two files either in a two pane view or in a one pane view If you want to merge three files TortoiseMerge will show you the differences in a three pane view This view is generally used if you need to resolve conflicted files The output file is not named in this case and you will have to use the File Save As to save the results 3 5 2 Applying Patches If you want to apply a patch file you have to set both the path to the patch file itself and the path to the folder where the patch file should be applied 11 Using TortoiseMerge EN Caution Currently only patch files in Unified Diff Format are supported And only files which were generated from a Subversion working copy Other formats like patch files generated by CVS are currently not supported 3 6 Settings 3 6 1 Main Settings Page Setting
20. oiseMerge L bbe Onken for the beautiful icons logo bug hunting and taking care of the documentation The Tigris Style project for some of the styles which are reused in this documentation Our Contributors for the patches bug reports and new ideas and for helping others by answering questions on our mailing list vi Preface Our Donators for many hours of joy with the music they sent us Vil Chapter 1 Introduction 1 1 Overview TortoiseMerge is a free open source application It lets you see differences in text files merge those changes and even review and apply unified diff files often called patches While working on text files e g source files in your favourite programming language or html xml files for your documentation or website you will often have a situation where you need to compare different versions of those files Sometimes you get a different version from someone else sometimes you just want to see the changes you ve made If you re working with a version control system e g Subversion then you sometimes get conflicts when you update your working copy This happens if someone else changed the same parts of the file you re currently working on as you did Then you have to resolve those conflicts manually This is where TortoiseMerge can help you The following diagram shows you the relationships between the files involved in a conflict file conflict N ifl Time Figure
21. ou can see changes he has made and possibly commit them to the repository Or it may have been generated internally by TortoiseSVN when comparing two folders This happens when you compare a repository revision with your working copy folder or if you compare two different repository revisions or if you compare two different repository paths In either case TortoiseMerge will show a small window listing the files included in the patch By double clicking on one of these files you fetch the relevant file and apply the changes The left pane shows the original file content and the right pane shows it after the patch is applied You can edit the file in the right pane exactly as you would in compare edit mode Chapter 3 Using TortoiseMerge 3 1 Viewing Modes TortoiseMerge has three main viewing modes one pane two pane and three pane view One two pane view is used to view changes and three pane view is used to resolve conflicts 3 1 1 Viewing Merging SysImagelist cpp TortoiseMerge File Edit Navigate View Help return sfi ilcon 69 int CSysImageList GetDefaultIconIndex const 70 71 SHFILEINFO sfi ZeroMemory ssfi sizeof sfi return sfi ilcon 79 int FSwveTmanel iste GerFileTennTndev iennstr CStrings file enn t For Help press F1 Scroll horizontally with Ctrl Scrollwheel Figure 3 1 One Pane View Using TortoiseMerge Y SyslmageList cpp TortoiseMerge File Edit Navigate View Help
22. pdate Working Copy 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 1s directly accessible to the user without having to travel across a network 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 Resolving Conflicts When this is complete you can mark the conflicted files as being resolved which allows them to be committed Subversion keeps a local pristine 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 revert command to go back to the pristine copy Every time you commit a set of changes you create one new revision 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 In another sense a revision can refer to the set of changes that were made when that revision was created 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 svn date svn author svn log which
23. rate a single file summary of those changes in Unified Diff format A file of this type is often referred to as a Patch 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 In addition to versioning your directories and files Subversion allows you to add versioned metadata referred to as properties to each of your versioned directories and files Each property has a name and a value rather like a registry key Subversion has some special properties which it uses internally such as svn eol style TortoiseSVN has some too such as tsvn logminsize You can add your own properties with any name and value you choose 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 relocate your working copy so that its repository URLs point to the new location 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 Switch command instead 19 Glossary Repository Resolve Revert Revision Revision Property revprop SVN Switch U
24. 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 A frequently used abbreviation for Subversion The name of the Subversion custom protocol used by the svnserve repository server Just as Update to revision changes the time window of a working copy to look at a different point in history so Switch 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 This Subversion 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 This is your local sandbox 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 Checkout from a repository and you feed your changes back into the repository using Commit 20
25. s General Colors Misc E Backup original file Jump to first difference when loading use one pane view as default for 2 file diff Show linenumbers Use strikeout For removed lines Tab size 4 Font W Courier New Diffing Ignore line endings recommended C Ignore case changes Color code in line changes Compare whitespaces O Ignore whitespace changes O Ignore all whitespaces N C Cena Figure 3 7 The Settings Main Page Most of the options here are self explanatory but a few points need clarifying Backup original file renames the original file in the WC to filename bak before saving the modified version Ignore line endings hides changes which are due solely to difference in line end style Ignore case changes hides changes which are due solely to case changes within the text This can be useful with apps such as Visual Basic which changes case in variables without warning Colour code in line changes uses the same scheme as the line diff bar to show the detailed in line changes within the main display panes Lines which have been heavily modified will not be shown using this method as the results are simply confusing In this case the line will be shown as replaced old line deleted new line added 12 Using TortoiseMerge Compare whitespaces shows all changes in indentation and inline whitespace as added removed lines which is how Subversion treats such changes I
26. s you to hide it so you can see both windows or show it so you can review the file list Settings takes you to TortoiseMerge s settings dialog On the left side of the window is a locator bar This provides a quick visual reference as to where the changes lie within the file The bar has three columns The left column refers to the left pane the right column to the right pane and the centre column to the bottom pane if present In one pane view only the left column is used The locator bar can also be used as a scroll bar to scroll all the windows simultaneously Below the bottom window is the status bar This shows the number of lines added and deleted in Theirs and Mine and the number of unresolved conflicts remaining You can also see which line ending style is in use what encoding ASCH UTF 8 etc is assumed by TortoiseMerge and whether there is a byte order mark BOM present in UTF 8 files The left side of the status bar is used to display hints when you hover the mouse over a control 3 3 Line Status Icons Changed lines are marked with an icon to indicate what type of change has occurred Using TortoiseMerge A line has been added A line has been removed A change has been undone by reverting to the original content of the line This line contains only whitespace changes Where several consecutive lines are marked the paragraph may have been re wrapped causing words to shuffle onto adjacent lines
27. witch and put the string path after it Example base c folder my base file txt Command Des Description Shows a dialog box with the most important command line switches Specifies the base file used in three way diffs This is the common ancestor of the files being diffed although it is not shown in a separate window For two way diffs this is the left file basename The name of the base file This is shown in the view title instead of the file path For three way diffs it is shown in a tooltip for the view title Specifies the theirs file used in three way diffs displayed in the left pane theirsname The name of the theirs file This is shown in the view title instead of the file path i Specifies the mine file used in three way diffs displayed in the right pane For two way diffs this is the right file The name of the mine file This is shown in the view title instead of the file path merged Specifies the resulting merged file used in three way diffs This is the file path where the result of the merge conflict resolving is saved If this is not set then TortoiseMerge will ask the user where to save the result The name of the merged file This is shown in the view title instead of the file path patchpath The path where a patch should be applied to If you don t set this path then TortoiseMerge will try to find the path itself to match the paths in the patch file but that can take very long patchorigin
28. you re working with a source control system and others are working on the same files as you 1 TortoiseMerge is free TortoiseMerge is free You don t have to pay for it you can use it any way you want It is developed under the GP license GPL TortoiseMerge 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 hitp tortoisesvn tigris org svn tortoisesvn http tortoisesvn tigris org svn tortoisesvn You will be prompted to enter username and password The username is guest and the password must be left blank The most recent version where we re currently working is located under trunk and the released versions are located under tags Donate Even though TortoiseSVN 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 While working on TortoiseSVN we love to listen to music And since we spend many hours on the project we need a lot of music Therefore we have set up some wish lists with our favourite music CDs and DVDs Attp tortoisesvn tigris org donate html http tortoisesvn tigris org donate html Please also have a look at the list of people who contributed to the project by sending in patches or translations 2 Acknowledgments Stefan K ng for the hard work on Tort
Download Pdf Manuals
Related Search