Home

Syncro SVN Client 5.1 User Manual

Contents

1. 58 The Syncro SVN Client e Current value presents the current value and allows you to change it e Base value the value of the property if any from the resource in the pristine copy It cannot be modified If you want to completely remove a property previously set you can choose Remove property action It will display a confirmation dialog in which you can choose also if the property will be removed recursively In the Properties view there is a Refresh action which can be used when the properties have been changed from outside the view This can happen for example when the view was already presenting the properties of a resource and they have been changed after an Update operation Creation and management of Branches Tags One of the fundamental features of version control systems is the ability to create a new line of development from the main one This new line of development will always share a common history with the main line if you look far enough back in time This line is known as a branch Branches are mostly used to try out features or fixes When the feature or fix is finished the branch can be merged back into the main branch trunk Another feature of version control systems is the ability to take a snapshot of a particular revision so you can at any time recreate a certain build or environment This is known as tagging Tagging is especially useful when making release versions In Subversion there is no
2. 67 The Syncro SVN Client Relocate a Working Copy When the base URL of the repository changed for example the repository itself was relocated to a different server you do not have to check out again a working copy from the new repository location It is easier to change the base URL of the root folder of the working copy to the new URL of the repository This action is available on the Jools menu only if the selected item of the working copy tree is a versioned folder If the selected item is not the root folder of the working copy then the effect is the same as for the Switch action applied on the same selected item Create Patches Let s suppose you are working to a set of XML files that you distribute to other people From time to time you are tagging the project and distribute the releases If you continue working for a period correcting problems you may find yourself in the situations to notify your users that you have corrected a problem In this case you may prefer to distribute them a patch a collection of differences that applied over the last distribution would correct the problem The SVN client creates the patch in the Unified Diff format http en wikipedia org wiki Diff Unified_format Creating patches in Subversion implies the access to two states revisions of a project If you have not committed yet your current working copy and prefer not to do it it is possible to create a patch between the current working
3. C Ignore ancestry C Ignore line endings C Ignore Whitespaces Output Save in clipboard Save in file D projects test S N patch Working with repositories Import Export resources Importing resources into a repository This is the process of taking a project and importing it into a repository so that it can be managed by Subversion If you have already been using Subversion and you have an existing working copy you want to use then you will likely want to follow the procedure for Use an existing working copy A dialog will ask you to select a directory that will be imported into the selected repository location The complete directory tree will be imported into the repository including all files The name of the imported folder will not appear in the repository but only the contents of the folder will Exporting resources from a repository This is the process of taking a resource from the repository and saving it locally in a clean form with no version control information This is very useful when you need a clean build for an install ation kit The export dialog is very similar to the check out dialog You can choose the target directory from the file system by pressing the Browse button If you need to export a specific revision you can 74 The Syncro SVN Client select the Revision radio button and then click on the History button and choose a revision from the new dialog Or you co
4. Property value unchanged property Above the table it is specified the currently active resource for which the properties are presented Here you will also find a warning when an unversioned resource is selected The table in which the properties are presented has four columns e State can be one of e empty normal unmodified property same current and base values e asterisk modified property current and base values are different e plus new property e minus removed property e Name the property name e Current value the current value of the property e Base value the base original value of the property The svn externals property The svn externals property can be set on a folder or a file In the first case it stores the URL of a folder from other repository In the second case it stores the URL of a file from other repository The external file will be added into the working copy as a versioned item There are a few differences between directory and file externals The path to the file external must be in a working copy that is already checked out While directory externals can place the external directory at any depth and it will create any intermediate direct ories file externals must be placed into a working copy that is already checked out 100 The Syncro SVN Client The file external s URL must be in the same repository as the URL that the file external will be inse
5. Subversion 1 6 Depth Recursive infinity Revision HEAD O Revision After a check out the new working copy will be added to the list in the Working Copy view and its content will be displayed in that view Depth You can choose the depth for the checkout folder This allows you to specify the recursion level into children This is used if you want to check out only a portion of an working copy and then bring in a future update operation previously ignored files and subdirectories You can find out more about checkout depth in the sparse checkouts section Revision By default the last HEAD revision will be checked out If you need another revision you can select the Revision radio button and then click on the History button and choose a desired revision from the new dialog Or you can simply type the revision number in the corresponding text field 30 The Syncro SVN Client Figure 3 7 History dialog 2007 03 27 17 38 30 Exclude chapter Visual XML Editor from releases before oXygen 9 2007 03 27 17 36 30 2007 03 27 16 27 09 2007 03 26 09 58 51 Changed version number of SVN Client to 2 3 of oXygen to 8 2 Created c Review and on the Documentation page of the o Specified that ApplyTransformation Scenario button is located on Transfor 2007 03 22 17 39 22 Do not generate Windows CHM help file For the dist target at a release 2007 03 22 14 30
6. e Relative to the root URL of the server on which the svn externals property is versioned Open This action will open the selected file in an editor where you can make modifications to 1t The action is active only when a single item is selected In case of a file the action opens the file with the internal editor or the external application associated with that file type In case of a folder the action opens the selected folder with the system application for folders for example Windows Explorer on Windows Finder on Mac OS X etc Folder opening is available only for folders selected in the Working Copy view This action works on any file selection from Repository view Working Copy view Synchronize view History view or Directory Change Set view depending on which view was last focused when invoking it e Open with Displays the Open with dialog for specifying the editor in which the selected file will be opened In case multiple files are selected only external applications can be used to open the files This action works on any file selection from Repository view Working Copy view Synchronize view History view or Directory Change Set view depending on which view was last focused when invoking it bel Save Saves the local file currently opened in the Editor view or the Compare view e Show SVN Properties brings up the Properties view and displays the SVN properties for a selected resource from Repository view
7. bugtraq logregex This property contains one or two regular expressions separated by a newline If only one expression is set then the bug ID s must be matched in the groups of the regexp string Example Ii ssue d If two expressions are set then the first expression is used to find a string which relates to a bug ID but may contain more than just the bug ID e g Issue 123 or resolves issue 123 The second expression is then used to extract the bug ID from the string ex tracted with the first expression An example if you want to catch every pattern issue FXXX and issue 890 789 inside a log message you could use the following regexp strings Tilssue d 2 2 d t d The data configured with these SVN properties is stored on the repository when a revision is com mitted A bug tracking system or a statistics tools can retrieve from the SVN server the revisions that affected a bug and present the commits related to that bug to the user of the bug tracking system If the bugtraq url property was filled in with the URL of the bug tracking system and this URL includes the BUGID substring as specified above in the description of the bugtraq url property then the History view presents the bug ID as a hyperlink in the commit message A click on such a hyperlink in the commit message of a revision opens a Web browser at the page corresponding to the bug affected by that commit Obtain
8. In Subversion both files and directories are versioned and have a history If you want to examine the history for a selected resource and find out what happened at a certain revision you can use the History view that can be accessed from any of the three views Repository view menu Working copy view menu or Synchronize view menu From the Repository view you can display the log history regarding any repository resource From the Working copy view you can display the history of local versioned resources From the Synchronize view you can show the history of any incoming or outgoing resources The view consists of three distinct areas e The revision table showing revision numbers date time of revision the name of the author as well as the first line of the commit message e The list of resources affected by this revision modified added deleted or changed properties e The commit message for the selected revision 95 The Syncro SVN Client Figure 3 34 History View History site xml Last changed revision 4263 og x Find george q e y Revision Date Author Message 4326 2008 05 08 19 07 47 george Updated the highlight ES 4322 2008 05 08 16 49 25 george remove remove 4312 2008 05 08 12 31 41 george Update Intel support 4307 2008 05 08 11 17 18 _ george Update Intel support 3 4304 2008 05 08 11 03 22 t scription to true for two i La 4300 2008 05 08 09 55 14
9. Incremental Regular expression cial characters like newline and tab can be inserted using the contextual menu It may contain regexp group markers if the search expression is a regular expression and the regu lar expression checkbox is checked Unicode characters can also be used in the Replace with area The last find and replace operations history is available using the O History buttons from the top of the find or replace text area Specify if the search direction is from current position to end of file forward direction or to start of file backward direction Specify if the search is executed on all file or only on the lines that were selected when the dialog was invoked If the selection was on a single line the search is executed on all the file Execute a find operation for the next occurrence of the target and stop Execute a replace operation for the target followed by a find operation for the next occurrence Execute a replace operation in the entire scope of the docu ment Execute a replace operation starting from current target until the end of the document in the direction specified by the current selection of the Direction switch forward or back ward When checked operations are case sensitive When checked only whole occurrences of a word will be included in the operation When checked search operation is started for every letter typed in or deleted The first match that obeys the checked
10. The Syncro SVN Client e Compare resources view e Editor Image preview e History view e Properties view e Console view e Help view e Preferences dialog Main window Figure 3 1 The Syncro SVN Client main window File Edit Repository Working copy Synchronize Compare Layout Options Help Repository og x http decebal sync ro svn repos userguide trunk usermanual xml hax ti EX I339 1 38 Repositories usermanual xml 1761 lt usermanual xml 1535 silistitem gt al silistitem slistitem gt slistitem lt para gt para gt da Copy location allows you tc Rename allows you to cha 2 site commons zipara gt lt ipara gt D siteapis ilistitem gt silistitern T userguide sfitemizedlist gt listitem gt T wow oxygenxml com sisecti gt para gt D waw sync ro sisect4 gt Move allows you to move tr CD waws syncrosynclient com lt sect4 id eXist connection gt ipara stitle gt eXist Connections title gt silistitem amp svn ssli idevel sync rofsyn repos lt fitemizedlist gt hh sun ssh devel sync ro home swnfrepos a y i lt cent ids eWistronnertion level gt lt lcorti gt E pe A Working copy o RG A Juserguide a S E Synchronize result SYN userguide fa buld xml eyes Ce lt 3 o build _part xml o3 eclipseCustomLayer xsl Co userguide lt o3 eclipseDriver xsl Ge articles 03 filterScale xsl Ge config lt o3 htmiCustomLayer xsl 7d dist eclipse lt o3 htmlDriver
11. General description The working copy view allows you to manage with ease the content of the working copy Resources files and folders are presented in a tree view with the root of the tree representing the location of the working copy on the file system Each resource has an icon representation which describes the type of resource and also depicts the state of that resource with a small overlay icon 79 The Syncro SVN Client Figure 3 31 The Working Copy View Working copy o ag x 5 A lUserManual x a 9 U D Projects UserManual la a announce test config Gg css 2 img lt fals table css lt docbook css g0 folds css ge html_cals_table css 0 developer guide 2 14 dist author y site dist authorEclipse For each file and folder a tooltip is displayed with details like SVN status full path current revision number last changed date etc If the tooltips seem annoying by covering useful information they can be disabled from the option Show tooltip on Working Copy and Synchronize trees Working Copy format When a SVN working copy is loaded in the view by selecting it in the combo on the toolbar of the view Syncro SVN Client first checks the format of the working copy If it is a SVN 1 6 format the admin data of that working copy is loaded and displayed in a tree like form in the view using the icons specific for the status of each resource normal unversioned modified etc If it is th
12. KILES Corrected instructions for Revision 757 gt Fixed errors in how to conn Revision 751 Removed wrong tag wihch created Juserguidetrunkitrunklusermanual xml 749 P Release 7 2 Juserguidettags 2 usermanual xml 748 Release 7 2 ote Juserguideltrunkusermanualxrml 747 F Juserguidestrunkitrunkiusermanualxml 747 juserquideftrunklusermanualxml 746 lt 102 The Syncro SVN Client In every node of the revision graph an icon and the background color represent the type of operation that created the revision represented in that node Also the commit message associated with that revision the repository path and the revision number are contained in the node The tooltip displayed when the mouse pointer hovers over a node specifies the URL of the resource the SVN user who created the revision of that node the revision number the date of creation the commit message the modification type and the affected paths The types of nodes used in the graph are added resource the icon for a new resource added to the repository Ed and green background copied resource the icon for a resource copied to other location for example when a SVN tag is created and green background modified resource the icon for a modified resource H and blue background deleted resource the icon for a resource deleted from the repository 83 and red back ground replaced resource
13. conditions will be highlighted When checked allows using any regular expression in PERL syntax 116 Text editor specific actions Dot matches all A dot used in a regular expression matches also end of line characters Wrap around Continues the find from the start end of the document after reaching the end start if the search is in forward backward direction Find All Elements Attributes In Author mode an attribute cannot be searched directly For finding an attribute just click on the link Find All Elements At tributes which opens the dialog with the same name Keyboard shortcuts for finding the next and previous match Navigation from a find match to the next one or the previous one is very easy with two keyboard shortcuts F3 and Shift F3 They are useful to quickly repeat the last find action performed with the Find Replace dialog taking into account the same find options set there through check boxes Find gt Find Next F3 performs another search in forward direction using the last search config uration Find gt Find Previous Shift F3 performs another search in backward direction using the last search configuration Dragging and dropping the selected text To move a whole region of text to other location in the same edited document just select the text drag the selection by holding down the left mouse button and drop it to the target location Exiting the application File gt Exit Ctrl
14. e A file can be considered to obstruct a directory if the directory was deleted and there was created a file having exactly the same name as the deleted directory so an unexpected unver sioned file is found instead of the original directory C External This indicates a mapping of a local directory to the URL of a versioned resource It is declared with a svn externals property in the parent folder Normal A resource with no overlaid icon is an unmodified resource under version control Grayed A resource with a grayed icon but no overlaid icon is an ignored resource It is ob tained with the action Add to svn ignore Switched This indicates a resource that has been switched from the initial repository location to a new location within the same repository The resource goes to this state as a result of the Switch action executed from the contextual menu of the Working Copy view e Immediate children sparse checkout The directory is marked with a purple bubble in the top left corner e File children only sparse checkout The directory is marked with a blue bubble in the top left corner e This folder only empty sparse checkout The directory is marked with a gray bubble in the top left corner 87 The Syncro SVN Client Synchronize View General description The synchronize view is visible in the default layout configuration It displays the result of a Refresh or Synchronize operation in a hierarchical
15. sync bak file If you did not finish editing the conflicts in a file at the first run of the action Edit Conflict you can run the action again and you will be prompted to choose between resuming the editing where the previous run left it and starting again from the conflict file received from the SVN server After the conflicts are edited and saved in the local version of the file you usually run the action Mark Resolved on the file so that the result of the conflict editing process can be committed to the SVN repository or the action Revert so that the repository version overwrites all the local modific ations Both actions remove the backup file and other temporary files created with the conflict version of the local file Revert your changes If you want to undo all changes you made in a file since the last update you need to select the file right click to pop up the context menu and then select Revert A dialog will pop up showing you the files that you have changed and can be reverted Select those you want to revert and click the OK button Revert will only undo your local changes It does not undo any changes which have already been committed If you choose to revert the file to the pristine copy which resides in the administration folders then the eventual conflict is solved by losing your outgoing modifications If you try to revert a resource not under version control the resource will be deleted from the file system If you want some
16. 52 presentation modes 38 resolve conflicts 43 143 Index content conflicts vs property conflicts 43 drop incoming modifications 48 edit real content conflicts 44 merge conflicted resources 47 real conflicts vs mergeable conflicts 43 revert changes 46 update the working copy 49 view differences 41 T Text editor specific actions 114 drag and drop 117 exit the application 117 undo and redo 114 U Uninstalling the application 12 Upgrade 11 check for new version 11 144
17. 53 Corrected description of private key passphrase SFTP mechanism 2007 03 19 16 02 00 Eclipse manual does not have Windows help 2007 03 19 15 22 10 Added protocol FILE to protocols supported in SVN client Commit message EXM 8705 Review and update articles on the Documentation page of the oXygen website The History dialog presents a list of revisions for a resource There are presented information about revision commit date author and commit comment The initial number of entries in the list is 50 Additional revisions can be added to the list using the amp Get next 50 and Y Get all buttons The list of revisions can be refreshed at any time with the Refresh button The Affected Paths area displays all paths affected by the commit of the revision selected in history On a revision selected in the Affected Paths area the contextual menu contains the actions Compare with previous version Open Save revision to Revert changes from this revision Update to revision Make a diff between the selected revision and the previous one If there is no external application specified for executing diff operations the built in diff tool is applied This is the action also executed on double clicking on a file in the Af fected Paths area Opens the revision in the editor panel Save the revision to a new file The changes committed by the selected revision are reverted in t
18. Configuring the application e Always ask you will be notified when such a working copy is used and you are allowed to choose what action to be taken if to upgrade or not the format of the current working copy e Automatically refresh the working copy if this checkbox is selected the working copy is refreshed from cache Only the new changes are refreshed from disk e Show tooltip on Working Copy and Synchronize trees For each file and folder a tooltip is dis played with details like SVN status full path current revision number last changed date etc If the tooltips seem annoying by covering useful information they can be disabled with this option Enable working copy caching if it is selected the content of the working copies is cached for refresh operations e Application global ignores allows setting file patterns that may include the wildcard and for unversioned files and folders that must be ignored when displaying the working copy resources in the Working Copy view Diff The SVN Diff preferences panel is opened from menu Options gt Preferences Diff and it allows you set the compare options for SVN Figure 5 10 The SVN Diff preferences panel Diff C Show pseudo conflicts C Compare with External Application Maximum number of differences 1000 Customize compare colors e Show pseudo conflicts it allows you to specify if you want to see pseudo conflicts in the Compare view A pseud
19. Each copy will also have the original resource s history For more details please read the section Copy Move Rename resources e Move This command actually performs as if a copy and then a delete command were issued You will find the moved resources at the desired destination and also at their original location but marked as deleted 82 The Syncro SVN Client e Rename You can only rename a resource at a time As for the move command a copy of the original resource will be made with the new name and the original will be marked as deleted e Delete This action allows you to delete resources from the Subversion working copy If un versioned added or modified resources will be encountered a dialog will prompt you to confirm their deletion This is because their content cannot be recovered The action it is not enabled when the selection contains missing resources Copy URL Location copies the encoded URL for the selected resource from the Working Copy to the clipboard Synchronize it contacts the repository and determines the working copy and the repository changes made to the selected resources It displays the result of the operation in the Synchronize view This is useful when you have a large working copy and you only want to verify the changes to a specific part you are currently working on Refresh This action will rescan the selected resources recursively and refresh their status in the working co
20. It is available on when the selected item into the working copy is a versioned resource except an external folder To read more about this see Switching the Repository Location e Relocate allows you to change the base URL of the root folder of the working copy to a new URL when the base URL of the repository changed for example the repository itself was relocated to a different server This operation is available for a selected item of the working copy tree that is a versioned folder To read more about this operation see Relocate a Working Copy e Create patch allows you to create a file containing all the differences between two resources based on the svn diff command This operation is available for any selected resource from the Working Copy view or from the Synchronize view depending on which view was last focused when invoking it To read more about creating patches see Create Patches e Working copy format this submenu contains the following two operations Upgrade allows you to upgrade the format of the current working copy to the newest one known by Syncro SVN Client to allow you to benefit of all the new features of the client Downgrade allows you to downgrade the format of the current working copy to an older format The formats allowed to downgrade to are SVN 1 5 and SVN 1 4 This is useful in case you wish to use older SVN clients with the current working copy or by mistake you have upgrad
21. OS X SHOME subversion auth Example home John subver sion auth There will be one file for each server that you access If you want to make Subversion forget your credentials you can use the Reset authentication command from the Options menu This will cause Subversion to forget all your credentials Note When you reset the authentication data you will have to restart the application in order for the change to take effect D Tip The FILE protocol is recommended if the SVN server and Syncro SVN Client are located on the same computer as it ensures faster access to the SVN server than the other protocols For https connections where client authentication is required by your SSL server you have to choose the Certificate File and enter the corresponding Certificate Password which is used to protect your certificate When using a secure http https protocol for accessing a repository a Certificate information dialog will pop up and ask you whether you accept the certificate permanently temporarily or simply deny it If the repository used has svn ssh protocol the SSH authentication can also be made with a private key and a pass phrase 27 The Syncro SVN Client Figure 3 4 User amp Private key authentication dialog SSH Authentication Repository svn ssh devel sync ro User marius Authentication By password Password By public key Private key file E Passphrase Store authentication d
22. Resolve a tree conflict 5 Tree conflict Description As a result of the last update operation the Following resource is now in tree conflict D SYN5 css sample1 xhtml The resource was locally edited and remotely deleted Conflict left source http idevel sync ro svnfrepos trunk Samples css sample1 xhtml 456 Conflict right source http devel sync ro svnjrepos trunk Samples css sample1 xhtml 695 Please choose an action to resolve the conflict Keep local modified resource Keep incoming change delete resource Cancel e keep the the local modified file if there is a renamed version of the file committed by other user that will be added to the working copy too e delete the local modified file which means keep the incoming change that comes from the repos itory Update the working copy While you are working on a project other members of your team may be committing changes to the project repository To get these changes you have to update your working copy Updating may be done on single files a set of selected files or recursively on entire directory hierarchies The update operation can be performed either from Working Copy view or Synchronize view The Update action in the Working Copy view is different from the Update action in the Synchronize view The Update action from the Working Copy view updates the selected resources to the HEAD revision on the repository The Synchron
23. Show SVN Properties brings up the Properties view and displays the SVN properties for the selected repository resource This view does not allow adding editing or removing SVN properties of a repository item These operations are allowed only for working copy resources File Information provides additional information for the selected repository For more details please see the section Information view The repository resources context menu from the view contains the following actions Refresh refreshes the currently selected resources from the repository th Check Out checks out a working copy from the selected directory in the repository Import e Import Folder Content imports the content of a specified folder from the file system into the selected folder from the repository e Import File s imports the files selected from the files system into the selected folder from the repository Export exports a directory from the repository to the local file system New Folder allows you to create a new folder in the selected repository path Open opens the selected file in the Editor view in read only mode Open with Displays the Open with dialog for specifying the editor in which the selected file will be opened In case multiple files are selected only external applications can be used to open the files Edit e Copy displays the Copy Files dialog which allows you to select the
24. Syncro SVN Client license is inclusive of third party licensing Printed November 2009 Table of Contents VIADEO A A ALS ee a tad 1 2 MS see ate lets hiiu cea tee ta ee eae ea al eee alas ead ody 2 Sta IR CUMS ERAS EOS dS le avd Seca nach cctv cle wan gan ei dau ga eae ae dees 2 PlatormeaR Equina 2 Operating System Tools and Environment Requirements ocoococcccnocccononcnonnncninnncnnnnncn ns 2 Operations 2 ROS is aed a Be hs E Car E EN 2 Environment Prerequisites ds 2 Installation IMstrictiOns A Ae es Ae E EE 3 Unattended installation il A is 6 Setting a parameter in the startup SOTPy id Ad Pei 7 Starting the applicatiorn oera S A R Dag a A E 8 Obtaining and registering a cas ida 9 Named User license TESIS TOA i n 9 License registration with a registration code oo eee ceeeeeeeeenceceaeceseeeeeeeeaeesnaeenseeseees 10 Upgrading the Syncro SVN Client application oooooocccnoncccnoncnononcnononanononannnnncconnoconnnanonnnnss 11 Checking FOE NeW VESTAS ous eis acta hice do 11 Uninstalling ThE 3Ppie son io di 12 Unattended tas tal ae de ich wears E as ecg sd eau na 12 Pertormance PS Oe 12 Larse documents eoe cca agg te o aoa 12 Display problems on Linux Solaris acis4 tassios a 13 red AA eee Rarer i oe eee Rte ea Nee ee 14 A renee 14 Whatis Syncro SVN Chent Mos eate Senra O Ea E 14 Quick Start guide and referente sonin n E E RNA 14 Man WIN A A Be EE edhe Be eat dae E a BA ce ee 15 Starina Syncro SVN CHENG oean a a A A E
25. Syncro SVN Client can run on all Operating Systems that support the Java Runtime Environment JRE version 1 5 0 or later The following instructions assume that JRE and the appropriate Syncro SVN Client distribution package for your Operating System are installed To start the application follow the instructions for the installed package Procedure 2 7 Windows e From the Windows Explorer double click syncroSVNClient exe Procedure 2 8 Linux e Atthe prompt type sh syncroSVNClient sh Procedure 2 9 Mac OS X e Double click the syncroSVNClient icon Procedure 2 10 All Platforms e On Windows run syncroSVNClient bat On Mac OS X run syncroSVNClient Mac sh On Linux Unix run syncroSVNClient sh Installation Obtaining and registering a license key The Syncro SVN Client is not free software and requires a license in order to enable the application For demonstration and evaluation purposes a time limited license is available upon request from the Syncro SVN Client http www syncrosvnClient com register html web site This license is supplied at no cost for a period of 30 days from date of issue During this period the Syncro SVN Client is fully functional enabling you to test all aspects of the application Thereafter the application is disabled and a permanent license must be purchased in order to use the application For special circumstances if a trial period of greater than 30 days is required please contact lt
26. UserManual dist author site ug author fimg sa_author_che ma UserManual dist author site ug author fimg sa_author_cor a UserManual dist author site ug author fimg sa_dg_configu m UserManual dist author site ug author fimg sa_dg_configu kH UserManual dist author site ug author img sa_dg_confiqu s gt he arar ar arre Switching between the three presentation modes is done with the switch button on the right side of the toolbar of the Synchronize view View differences One of the most common requirements in project development is to see what changes have been made to the files from your Working Copy or to the files from the repository You can examine these changes after a synchronize operation with the repository by using the Open in compare ed itor action from the contextual menu The text files are compared using a built in Compare View which uses a line differencing algorithm or a specified external diff application if such an application is set in the SVN preferences When a file with outgoing status is involved the compare is performed between the file from the working copy and the BASE revision of the file When a file with incoming or conflict status is involved the differences are computed using a three way algorithm which means that the local file and the repository file are each compared with the BASE revision of the file The results are displayed in the same view The differences obtained from the local fi
27. a partic ular revision from being merged by marking it as already merged This will prevent future merging By pressing the Test merge button you can choose to do a Dry run of the Merge operation in order to see what files are affected and how without modifying the working copy at all This is very helpful in detecting where conflicts may occur Press the Merge button in order for the operation to take place You will obtain the result in the selected resource from the working copy When the merge is completed it s a good idea to look at the result of the merge and see if it meets your expectations Because merging is sometimes complicated when there are major changes conflicts may appear Resolve merge conflicts After the merge operation is finished it is possible to have some resources in conflict This means that some incoming modifications for a resource could not be merged with the current modifications from the working copy If there are such conflicts a dialog will appear presenting you the resources that are in conflict and from where you can choose a way in which every conflict should be resolved 66 The Syncro SVN Client Figure 3 24 Merge conflicts dialog Merge conflicts Conflicting resources Resource State Kl workspace 2 office xml Mark resolved Sa workspace 2 template xsl Keep incoming Tel workspace 2 text1 txt Keep outgoing ia workspace 2 autocomplete php Keep incoming ec workspace 2 form ph
28. as Merged the action is enabled on pseudo conflicting resources It is used after you re solved the pseudo conflict by merging the changes and you want to commit the resource Read the Merge conflicts section for more information on methods to solve the pseudo conflicts 90 The Syncro SVN Client e Override and Update itis enabled on resources with outgoing changes including the conflicting ones It is used for dropping any outgoing change and replacing the local resource with the HEAD revision See the Revert your changes section e Override and Commit it is enabled on conflicting resources The action will drop any incoming changes and will send your local version of the resource to the repository See also Drop incoming modifications Show History It will display the History view where the log history for the selected resource will be presented For more details about resource history see the sections Using the resource history view and Request history for a resource lt Expand All expands the selected directories to leaf level 4 Collapse All collapses all child nodes of the selected tree node e Add to svn ignore This action can only be performed on resources not under version control It allows you to keep inside your working copy files that should not participate to the version control operations The action actually modifies the value of the svn ignore property of the re source s parent
29. can specify an URL to a folder resource from a repository in the Check Out dialog that appears when performing this operation To read more about this operation see Check out a working copy 19 The Syncro SVN Client e Import Import Folder Content depending on the selected folder from a repository allows you to import the contents of a specified folder from the file system into it To read more about this operation see Importing resources into a repository e Import File s imports the files selected from the files system into the selected folder from the repository Export allows you to export a directory from the repository to the local file system To use this operation you must select a repository root location or a folder from a repository but never a file If you don t select anything you can specify an URL to a folder resource from a repository in the Export dialog that appears when performing this operation To read more about this operation see Exporting resources from a repository Working copy operations from the Working copy view amp Add Remove Working Copy opens the Working copies list dialog which displays the working copies the Subversion client is aware of In this dialog you can add existing or remove no longer needed working copies e Synchronize contacts the repository and determines the changes made by you to the working copy and by others to the repository The synchronize r
30. conflict file If the button Cancel is pressed in this warning dialog the Edit Conflicts action is aborted Show confirmation dialog for drag Set this option to avoid doing a drag and drop when you just and drop actions in Working Copy want to select multiple files in the Working Copy view and run the same action on all selected files for example a Copy or a Commit Reset Global Options To reset all custom user settings of the application that are stored in a local file not in the project to the installation defaults go to Options Reset Global Options 140 Chapter 6 Common problems 6 1 I cannot connect to a SVN repository from the Repository Browser view of SVN client 6 1 How can I find more data about the error eee e ee eeeeeeccccceececcccecececceccececssccceaseseeees 141 I cannot connect to a SVN repository from the Repository Browser view of SVN client How can I find more data about the error First check that you entered the correct URL of the repository in the Repository Browser view Also check that a SVN server is running on the server machine specified in the repos itory URL and and is accepting connections from SVN clients You can check that the SVN server accepts connections with the command line SVN client from CollabNet If you try to access the repository with a svn ssh URL also check that a SSH server is running on port 22 on the server machine specified in the URL If the above co
31. copy and a revision from the repository If you want to create a patch between two revisions that are already committed to the repository that is also possible In order to create the patch you will use the action from the Jools menu Create Patch This opens the Create patch wizard 68 The Syncro SVN Client Figure 3 25 The Create patch wizard step 1 Create patch Select what type of patch you want to create Patch type 2 Create patch between working copy and repository resource Select this to create a patch between the selected working copy resource and a repository resource O Create patch between two repository resources Select this to create a patch between two repository resources or between two revisions of the same resource In the first step of the wizard you select the type of the patch a patch between working copy and repository revision or a patch between two repository revisions The Next button moves the wizard to the second step Create a patch from working copy In case of the first type of patch in this step you specify the revision of the repository for finding the patch between the working copy and the repository The revision can be HEAD or a revision number selected from the list of all revisions committed to the repository 69 The Syncro SVN Client Figure 3 26 Patch between working copy and repository step 2 Select the working copy resource revision to patch aga
32. difference between a tag and a branch On the repository both are ordinary directories that are created by copying The trick is that they are cheap copies instead of physical copies Cheap copies are similar to hard links in Unix which means that they merely link to a specific tree and revision without making a physical copy As a result branches and tags occupy little space on the repository and are created very quickly As long as nobody ever commits to the directory in question it remains a tag If people start com mitting to it it becomes a branch Create a Branch Tag In the Working Copy view or in the Repository view select the resource which you want to copy to a branch or tag then select the command Branch Tag from the Tools menu 59 The Syncro SVN Client Figure 3 19 The Branch Tag dialog E 5 Branch Tag Source Create Branch Tag using the resource with URL http decebal sync ro svn repos userguide trunk articles Copy from S HEAD revision in the repository Specific revision in the repository Working copy Destination Into repository s directory http decebal sync ro svn repos userguide trunk Under the name articles Commit message Previous messages Choose a previously entered message i The default target URL for the new branch tag will be the repository URL of the selected resource from your working copy divided in two the URL of the parent and t
33. double arrow icon can be edited visually with the Compare view the built in file diff tool or with an external diff application to decide for each conflict if the local version of the change will remain or the remote one instead of the special conflict markers inserted in the file by the SVN server The Compare view or the external diff application set in Preferences is opened with the action Edit Conflict which is available on the context menus of the Synchronize view and the Working Copy view and is enabled only for files in the conflicted state an update operation was executed but the differences could not be merged without conflicts The external diff application is called 44 The Syncro SVN Client with 3 parameters because it is a 3 way diff operation between the local version of the file from the working copy and the HEAD version from the SVN repository with the BASE version from the working copy as common ancestor If the option Show warning dialog when edit conflicts is enabled you will be warned at the beginning of the operation that the operation will overwrite the conflict version of the file received from the SVN server the version which contains the conflict markers lt lt lt lt lt lt lt gt gt gt gt gt gt gt with the original local version of the file that preceded the update operation If you press the OK button the visual conflict editing will proceed and a backup file of the conflict version re
34. folder of the working copy The order of the working copies can be changed in the list using the two arrow buttons which move the selected working copy with one position up or down Manage working copy resources Edit files You can edit files from the Working Copy View by double clicking them or by right clicking them and choosing Open from the popup menu or from the Synchronize View by using Open from the popup menu Please note that only one file can be edited at a time if you try to open another file it will be opened in the same editor window The editor has syntax highlighting for known file types meaning that a different color will be used for each type of recognized token in the file If the selected file is an image then it will be previewed in the editor with no access to modifying it 32 The Syncro SVN Client When you edit a file from your working copy you will notice that after modifying and saving it a modified marker an asterisk will appear on the file s icon in the Working Copy View Add resources to version control The new file s or folder s you create during your development process must be added to Version Control using the Add command from the context menu in Working Copy View or Synchronize View If you do not do this the resource will be marked with a question mark meaning that it is unversioned unknown After you have added it to version control the resource will be marked as added
35. form The nodes represent synchronized or refreshed resources and their status Figure 3 32 Synchronize View Synchronize result SYN UserManual GS e oO At o 4 D UserManual 0 gt announce test 5 0 css ol cals_table css D dist author dist authorEclipse 1 Fra dist oxygenEclipse 5 0 docbench lt ol gt docbench xml 2 ima S543 DeveloperGuide pdf lt 0 DeveloperGuide xml lt userguide windows css A userguide xpr lt o usermanual xml Synchronize trees The results are presented using four tree structures e Incoming changes tree presents items which contain incoming changes This includes resources modified and committed by others or resources newly added or newly deleted from the repository e Outgoing changes tree presents resources with outgoing changes meaning that they have been modified locally or have been added or deleted from your working copy Incoming Outgoing changes tree includes all the resources with incoming and outgoing changes e Conflicts tree includes resources with conflicting state meaning they contain both incoming and outgoing changes pseudo conflicting state or they are in a state of real conflict A resource which is in a real conflict state will not appear in the Incoming tree 88 The Syncro SVN Client For each file and folder a tooltip is displayed with details like SVN status full path current revision number last changed dat
36. george updated the new 9 2 features i 4299 2008 05 08 09 45 51 _ george more updates Y lt Mm gt Affected Paths Commit message Action Affected Paths Copy From Set the description to true for two M Awvwew oxygenxml compbranches rel8 xml site xml paragraphs lt Mm console 9 History x History Filters The History filter dialog The History view does not always show all the changes ever made to a resource because there may be thousands of changes and retrieving the entire list can take a long time Normally you are inter ested in the more recent ones That is why you can specify the criteria for the revisions displayed in the History view by selecting one of several options presented in the History dialog which is displayed when you invoke the Show History action Figure 3 35 History filters dialog Filters Allrevisions Between revisions 1687 History 2203 C For Between dates 96 The Syncro SVN Client The options for the set of revisions presented in the History view are e all the revisions of the selected resource e only the revisions between a start revision number and an end revision number e only the revisions added in a period of time like today last week last month etc e only the revisions between a start calendar date and an end calendar date e only the revisions committed by a specified SVN user The toolbar of the History view has two button
37. have the deleted mark The directories will be removed from the file system when you commit them to the repos itory You can also change your mind completely and revert the deleted files to their initial pristine state If a resource is deleted from the file system without Subversion s knowledge your working copy will be in an inconsistent state The resource will be considered and marked as missing 1 If a file was deleted it will be treated in the same way as if it was deleted by Subversion However if a directory is missing you will be unable to commit If you update your working copy Subversion will replace the missing directory with the latest version from the repository and you can then delete it the correct way using the Delete command The Delete action is not enabled when the selection contains missing resources Copy Move Rename resources Copy resources You can copy several resources from different locations of the working copy You select them in the Working Copy View and then you initiate the copy command from the context menu This is not a simple file system copy but a Subversion command It will copy the resource and the copy will also have the original resource s history This is one of Subversion s very important features as you can keep track of where the copied resources originated Please note that you can only copy resources that are under version control and are committed to the repository or unversioned resou
38. information for a resource Request status information for a resource While you are working you often need to know which files you have changed added removed or renamed or even which files got changed and committed by others That s where the Synchronize action from Working Copy view comes in handy The Working Copy View will show you every file that has changed in any way in your working copy as well as any unversioned files you may have If you use Synchronize view then you can also look for changes in the repository That way you can check before an update if there s a possible conflict If you want more detailed information about a given resource you can use Information action from the Working copy viewcontextual menu or the Synchronize viewcontextual menu A dialog called SVN Information will pop up showing remote and local information regarding the resource such as 53 The Syncro SVN Client e local path and repository location e revision number e last change author revision and date e commit comment e information about locks e local file status e local properties status e remote file status e remote properties status e file size etc The value of a property of the resource displayed in the dialog can be copied by right clicking on the property and selecting the Copy action A less detailed list of information is also presented when you hover with the mouse pointer over a resource and the tooltip window is d
39. location where the selected resources will be copied 78 The Syncro SVN Client e Move displays the Move Files dialog which allows you to select the location where the selected resources will be moved e Rename renames the current folder on the repository e Delete deletes the selected resources It will ask for confirmation e Copy URL Location copies the encoded URL for the selected resource from the repository to the clipboard e Branch Tag Allows you to create a branch or tag from the selected folder from the repository To read more about how to create a branch tag please see the Creation and management of Branches Tags section Show History brings up the History view and displays the log history for the selected re source from the repository li Show Annotation brings up the Annotations view e s Revision Graph brings up the Properties view and displays the SVN properties for the selected repository resource This view does not allow adding editing or removing SVN properties of a repository item These operations are allowed only for working copy resources Show SVN Properties brings up the Properties view and displays the SVN properties for the selected resource from the repository e O File Information provides additional information for the selected resource from the repos itory For more details please see the section Information view Working Copy View
40. manage Subversion repository locations e Working copy view allows you to manage with ease the content of the working copy e Synchronize view displays the modified resources from your working copy outgoing and from the repository incoming e Compare view displays the differences between two revisions of a text file e Compare images view displays the compared images side by side e Editor view allows you to modify and save a file from the working copy e Image preview allows you to view the image files from the Synchronize view Working copy view Synchronize view or from the History view e History view displays the log messages for a given resource 16 The Syncro SVN Client e Properties view displays the SVN properties for the currently selected resource from the Syn chronize view or from the Working copy view e Console view shows the start and progress of an operation as if a Subversion command was run from the shell e Help view dynamically shows the help for the currently selected view The main window s Status bar presents in the left side the operation in progress or the final result of the last performed action In the right side there is a progress bar for the running operation and a stop button to cancel the operation Main menu The main menu of the Syncro SVN Client is composed of the following menus e File e New e New File This operation creates a new file and adds it to version control If th
41. means of the Add SVN Repository dialog th Check Out checks out a working copy from the selected directory in the repository Displays the new working copy in the Working Copy view 76 The Syncro SVN Client Y Edit Repository Location context dependent allows you to edit the selected repository location by means of the Edit SVN Repository dialog It is active only when a repository location root is selected X Remove Repository Location allows you to remove the selected repository location from the view It shows you a confirmation dialog before removal It is active only when a repository location root is selected E Stop allows you to stop the current repository browsing operation executed when a repository node is expanded This is useful when the operation takes too long or the server is not responding Move Up move the selected repository up with one position in the list of repositories in the Repository view Move Down move the selected repository down with one position in the list of repositories in the Repository view Contextual menu actions The repository view has one contextual menu for the repository locations roots and another con textual menu for the repository resources Besides the actions described above the repository roots context menu from the repository view contains the following actions Refresh refreshes the currently selected repository th Check Out checks out a wo
42. modification used to navigate to the previous difference Go to next modification used to navigate to the next difference Go to last modification used to navigate to the last difference Copy change from right to left this action copies the selected change from the right editor to the left editor ti Copy all non conflicting changes from right to left this action copies all non conflicting changes from the right editor to the left editor A non conflicting change from the right editor is a change that does not overlap with a left editor change 3 Show modification details at word level because the differences are computed using a line differencing algorithm sometimes is useful to see exactly what words are different in a changed section 5 Show modification details at character level useful when you want to find out exactly what characters are different between the two analyzed sections Ignore whitespaces Enables or disables the whitespace ignoring feature Ignoring whitespace means that before the strings are compared they are first normalized and then the whitespace at the beginning and the end of the strings is trimmed These actions are available also from the Compare menu 93 The Syncro SVN Client Compare images view The images are compared using the Compare images view The images are presented in the left and right part scaled to fit the view s available area You can use the contextual menu act
43. none workspace test SVN text1 Ext unversioned none workspace test SVN users xquery unversioned none ESES ES KA ES SKS KS KS si Create patch from repository revision In case of the second type of patch in the second step of the wizard you select the two repository revisions The two revisions can be on the same repository or on two different repositories For each revision you can select the HEAD revision or a revision number available on the repository 12 The Syncro SVN Client Figure 3 29 Patch between two repository revisions step 2 Create patch Select the resources to create patch for From starting path and revision http devel sync ro svnjrepos trunk Samples lv O HEAD revision Other revision 374 To ending path and revision http devel sync ro svn repos branches Samples x 2 HEAD revision Other revision The next step of the wizard is the same as for the first type of patch It allows to specify the options patch depth ignore ancestry ignore line endings ignore whitespaces save in clipboard save in file The description of the options is the same as for the first type of patch 73 The Syncro SVN Client Figure 3 30 Patch between two repository revisions step 3 Create patch Ey Select patch options and output location Patch options Patch depth Recursive infinity
44. of the merge Scan for locks svn status show updates verbose show updates get the resource status by contacting the PATH repository verbose specifies that the status of all files should be re ported PATH The location on the file system to get status for The command will obtain the repository status for all the resources in the path 111 The Syncro SVN Client Lock svn lock force m log message PATH Unlock svn unlock force PATH Mark as merged Mark as merged rename FILE FILE TMP svn update FILE and rename FILE TMP FILE Override and update svn revert PATH svn update PATH Override and commit If the resource is in conflict it per forms first mark resolved and if the resource has incoming changes mark as merged and then svn commit m log message no unlock PATH Add Edit property svn propset recursive PROP NAME PROPVALUE PATH force forces steals the lock m log message the lock comment PATH the path to the file from the working copy force forces breaks the lock PATH the path to the file from the working copy F ILE the file to be marked as merged FILE TMP a temporary filename PATH the path of the resource to be overridden m log message specifies the commit comment no unlock specifies that the resource should keep locks after commit if this is the case PATH is the location on the file system
45. of your outgoing changes to be overridden you must first open the file in Compare view and choose the sections to be replaced with ones from repository file This can be achieved either by editing directly the file or by using the action Copy change from right to left from Compare view toolbar After editing the conflicting file you have to use Mark as merged before committing it 46 The Syncro SVN Client If you want to drop all local changes and in the same time bring all incoming changes into your working copy resource you can use the Override and update action which discards the changes in the local file and updates it from the repository A dialog will show you the files that will be affected Figure 3 14 Override and update dialog Pr Override and Update Do you want to override the local changes for the selected files Ttems Resource Status Properties Status Ly Userquiae ima warning gir junversionea none lla userquide lib eclipseHelp zip modified normal userquide lib help zip modified normal _ luserguide oxygen profiled standalone xml lunversioned none userguide usermanual html lunversioned none userguide usermanual xml modified none Select all Deselect all The Following items will be updated Items Resource Status Properties Status userguide none modified la userguidefimg ec_control_toolbar gif modified none userguidefusermanual xml modified n
46. option to set the background color of selected text Use this option to set the text color of selected text Use this option to set the background color of the editor and also of the Diff Files editors Use this option to set the background color of the editor Use this option to set the foreground color for the line num bers displayed at the right of editor panel 123 Configuring the application Show line numbers in editor This option enables the line numbers column located in the left part of the editing space When unchecked line numbers option is disabled Show TAB NBSP EOL EOF marks Marks the TAB NBSP EOL EOF using small icons for a better visualisation of the document Also set the marks color Show SPACE marks Marks the SPACE characters with a dot Indent with tabs When checked set the indent to a tab unit When unchecked the indent will measure as many spaces as needed in order to go to the next tab stop position The maximum number of space characters is defined by the Tab size option Tab size Sets the number of spaces or the tab size that will equal a single indent The Indent can be spaces or a tab select the preference using the Indent With Tabs option If set to 4 one tab will equal 4 white spaces or 1 tab with size of 4 charac ters depending on which option was set in the Indent With Tabs option Open Save The Open Save preferences panel is opened from menu Options Preferences Editor Open S
47. resource Update to revision updates your working copy resource 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 your changes Check out from revision gets the content of the selected revision for the resource into local file system Show Annotation brings up a dialog for selecting the start revision and the end revision of the interval of revisions for which the SVN annotations will be computed and marked in the se lected resource in the editor panel This option is available only when you access the history of a file Change allows you to change some commit information for a file e Author allows you to change the author that committed the selected file revision e Message allows you to change the commit message of the selected file revision History actions available on the popup menu for double selection e Compare revisions When the resource is a file the action compares the two selected revisions using the Compare view When the resource is a folder the action displays the set of all resources from that folder that were changed between the two revision numbers e Revert changes from these revisions Similar to the svn merge command it merges two selected revisions into the working copy resource Thi
48. resource The selected Show Annotation resource can be in the Working Copy view the Synchronize view or the History view af ll Display the revision graph of the selected resource The se Revision Graph lected resource can be in the Working Copy view the Syn chronize view or the Repository view The selected resource is compared with the BASE revision from the working copy when the selected resource is from the Working Copy view or the Synchronize view and with the working copy revision when the selected resource is from the History view ES Compare 25 The Syncro SVN Client Getting started Define a repository location Usually team members do all of their work separately in their own working copies and need to share their work This is done via a Subversion repository Syncro SVN Client supports the versions 1 3 1 4 1 5 and 1 6 of the SVN repository format Add Edit Remove repository locations Before you can begin working with a Subversion repository you must define a repository location in the Repository View To create a new repository location click the New Repository Location toolbar button 1 or right click inside the view and select New Repository Location from the popup menu On Windows the context menu can be displayed with the mouse on a right click or with the keyboard by pressing the special context menu key available on Windows keyboards The Add SVN Repository dialog wi
49. revision and the end revision of the interval of revisions for which the SVN annotations will be computed and marked in the selected resource in the editor panel After selecting the start revision and the end revision and pressing OK the Annotations view and the History view are displayed and the annotations are marked on the SVN resource in the editor panel This operation is available for any resource selected from Repository view Working Copy view History view or from Directory Change Sets view depending on which view was last focused when this action was invoked e Revision Graph This action allows you to see the graphical representation of a resource s history For more details about a resource s revision graph see the section Revision Graph 22 The Syncro SVN Client This operation is enabled for any resource selected into the Repository view or Working Copy view e Tools e Branch Tag allows you to copy the selected resource from the Repository Working Copy view to a branch or tag into the repository To read more about this operation see Creating a Branch Tag e Merge allows you to merge the changes made on one branch back into the trunk or vice versa using the selected resource from the working copy To read more about this operation see Merging e Switch allows you to change the repository location of a working copy or only of a versioned item of the working copy within the same repository
50. save it to disk by using the Save action from the File menu or the Ctrl S key shortcut After saving your file you can see the file changed status into Working copy view and Synchronize view If the internal editor associated with a file type is not the XML Editor then the encoding set in the preference Encoding for non XML files is used for opening and saving a file of that type This is necessary because in case of XML files the encoding is usually declared at the beginning of the XML file in a special declaration or it assumes the default value UTF 8 but in case of non XML files there is no standard mechanism for declaring the encoding of the file 94 The Syncro SVN Client Image preview Description You can view your local files by using the built in Image preview component The view can be accessed either from the Working copy view Synchronize view or from the Repository view It can also be used from the History view to view a selected revision of a image file Only one image file can be opened at a time If an image file is opened in the Image preview and you try to open another one it will be opened in the same window Supported image types are GIF JPEG JPG PNG BMP Once the image is displayed in the Image preview panel using the actions from the contextual menu one can scale the image at its original size 1 1 action or scale it down to fit in the view s available area Scale to fit action History View Description
51. the repository This action collects the outgoing changes from the selected resources and presents them in a dialog You can choose exactly what items will be committed by checking or unchecking them in the table Also you will have to enter a commit comment See also Sending your changes to the repository section Create patch allows you to create a file containing all the differences between the selected resource and the same resource at a previous revision or between two different resources based on the svn diff command To read more about creating patches see Create Patches Branch Tag It will display the Branch Tag dialog where you can create a branch or a tag from the selected repository folder Show History It will display the History view where the log history for the selected resource will be presented For more details about resource history see the sections Using the resource history view and Request history for a resource Revert itis useful when you want to undo all local changes made to a resource It is enabled on resources which contain outgoing changes Read the Revert your changes section for more information Edit conflict opens a Compare view for editing the selected conflicting resource Mark Resolved it is enabled on real conflicting resources Its function is to tell the Subversion system that you resolved the conflict and the resource can be committed See also Merge conflicts part Mark
52. view Figure 3 33 Compare View http fdecebal sync ro svnfrepos userguide trunk usermanual xml x BH ES 3I3748483Y8 usermanual xml 506 gt usermanual xml 500 their work This is done via a Subversion repos A lt para gt To create a new repository location click E lt sect3 id add edit remove repos locations gt Location lt emphasis gt toolbar button or righ lt title gt 4dd Edit Remove repository locatior select lt emphasis gt New Repository Location lt figure gt k lt figure gt title gt The Repository View contextual men K title gt The New Repository Location menu lt til screenshot gt screenshot gt lt mediaobject gt lt mediaobject gt lt imageobject gt lt imageobject gt lt imagedata align center fileref K A lt imagedata align center fleref ner lt jfimageobject gt lt fimageobject gt lt mediaobject gt lt mediaobject gt lt screenshot gt lt screenshot gt lt figure gt gt lt figure gt lt para gt Before you can begin working with a 5 lt para gt The lt emphasis gt Add SVN Repository lt el a repository location in the lt link inkend re j URL of the repository you want to connect to View lt link gt lt para gt is requested at the time the location is defined lt para gt To create a new repository location c to request the user and password information Y A 5 ua a E When comparing text the differenc
53. want to commit a renamed or moved resource you must also commit the deleted original It is also recommended that you commit the renamed or moved resources before changing their contents in order to avoid difficulties in resolving conflicts Lock Unlock resources The idea of version control is based on the copy modify merge model of file sharing This model states that each user contacts the repository and creates a local working copy check out Users can then work independently and make modifications to their working copies as they please When their goal has been accomplished it is time for the users to share their work with the others to send them to the repository commit When a user has modified a file that has been also modified on the repository the two files will have to be merged The version control system assists the user with the merging as much as it can but in the end the user is the one that must make sure it is done correctly The copy modify merge model only works when files are contextually mergeable this is usually the case of line based text files such as source code However this is not always possible with binary formats such as images or sounds In these situations the users must each have exclusive access to the file ending up with a lock modify unlock model Without this one or more users could end up wasting time on changes that cannot be merged 35 The Syncro SVN Client A Subversion lock is a piec
54. xsl History o jhCustomLayer xsl k jhDriver xsl History For usermanual xml Last changed revision 2210 bh https devel sync rofsvnfrepos amp svnifidevel sync ro testReposClean lt o license xml o pdfCustomLayer xsl 2007 01 05 15 44 26 03 pdfDriver xsl 2007 dl 05 09 57 a lt o3 profileDriver xsl E lt 9 userquide css Affected Paths p Commit message userguide xpr m a Paes Affected Paths Copy From added para about XML instance a fuserquide trunk usermanual xml generation in para about Mew 03 usermanual document dialog lt o3 xep xml lt o3 xml xsd y History console E Operation successful 04 10 gt 04 15 The Syncro SVN Client Starting Syncro SVN Client The Syncro SVN Client can be used as a standalone application To start the client follow the in structions for the installed package Procedure 3 1 Windows e From the Windows Explorer double click syncroSVNClient exe Procedure 3 2 Linux e Atthe prompt type sh syncroSVNClient sh Procedure 3 3 Mac OS X e Double click syncroS VNClient Procedure 3 4 All Platforms e OnWindows run syncroSVNClient bat On MacOS XrunsyncroSVNClient sh On Linux Unix run syncroSVNClient sh Views The main window consists of the following views e Repository view allows you to define and
55. 1 Introduction Welcome to the User Manual of Syncro SVN Client 5 1 This book explains how to use the 5 1 version of the Syncro SVN Client effectively to access Subversion repositories and manage their local working copies Please note that this manual assumes that you are familiar with the basic concepts of a version control system The Syncro SVN Client is a cross platform application for managing the history of a set of files that change over time and are stored in a central repository using a version control system Chapter 2 Installation This section explains platform requirements and installation procedures It also provides instructions on how to obtain and register a license key how to perform upgrades and uninstall the application if required If you need help at any point during these procedures please send email to lt support syncrosvnclient com gt Installation Requirements Platform Requirements Minimum run time requirements are listed below e Pentium Class Platform e 256 MB of RAM e 100 MB free disk space Operating System Tools and Environment Re quirements Operating System Windows Windows 98 or later Mac OS minimum Mac OS X 10 4 UNIX Linux All versions flavors Tools Installation packages are supplied in compressed archives Ensure you have installed a suitable archive extraction utility with which to extract the archive The MD5 sum is available on the Download page http www syncrosvnClien
56. 3 oof x Find george Q Q 4 Revision Date Author Message 4326 2008 05 08 19 07 47 george Updated the highlight a 14322 _ 2008 05 08 16 49 25 george remove remove 4312 2008 05 08 12 31 41 _ george update Intel support 4307 2008 05 08 11 17 18 george 4304 eee 11 03 22 george 4300 2008 05 08 09 55 14 george updated the new 9 2 features 4299 2008 05 08 09 45 51 george more updates f m je gt affected Paths Commit message Action Affected Paths Copy From Set the description to true for two M Awww oxygenxml com branches rel8 xml site xml paragraphs EN gt console 9 History x The Resource history view does not always show all the changes ever made to a resource because for a large repository there may be thousands of changes and retrieving the entire list can take a long time Normally you are interested in the more recent ones and that is why the number of revi sions is limited by default from the options to 50 This can be changed by accessing the Preferences gt SVN page a Note When using Subversion servers older than version 1 2 a history request may take a very long time because the server will reply with the entire history even if you limited the number of entries to a smaller number Using the resource history view The History view provides a set of actions you can use to get even more information about the project history and make changes to your working copy related wit
57. 3 24 09 21 33 sorin Removed dependency 292 2006 03 22 16 53 21 fsorin Refactored cust layers x ana ANANT AN EAL Pine de FAS An dd coms wie eobion Cue Affected Paths gt r Commit message Action Affected Paths Copy From Fix name and target of linkto M Juserguide trunk htmlCustomLayer xsl home page in the header of all x Console 9 History x The annotations of a file are computed with the action Show Annotation available on the right click menu of the History view and the Repository view If the file has a very long history the computation of the annotation data can take long If you want only the annotations of a range of revisions you can specify the start revision and the end revision of the range in a dialog similar with the History filter dialog that will be displayed in the History view The action is called Show Annotation and is available on the right click menu of the Working Copy view Properties View Description The properties view presents the Subversion properties for the currently selected resource from either the Working copy view or the Synchronize view 99 The Syncro SVN Client Figure 3 37 The Properties View Properties O x axce SVN properties For Fi txt Name Current Yalue Base Value prop F unchanged prope unchanged prope prop_modif modified to be modified prop_remove to be removed
58. Copy Ctrl C to place a copy of the current selection in the clipboard as RTF All text attributes such as color font or syntax highlight are preserved when pasting into another applic ation Edit gt Paste Ctrl V to place the current clipboard content into the document at the cursor position Edit gt Select All Ctrl A selects the entire body of the current document including whitespace preceding the first and following the last character Finding and replacing text in the current file The Find Replace dialog The Find Replace dialog opened with the menu entry Edit gt Find Replace Ctrl F enables you to define search for or search for and replace operations on the current document The find works on multiple lines which means a find match can cover characters on more than one line To insert a new line in the find or replace text area press CTRL Enter instead of Enter The replace operation can bind Perl 5 regular expression group variables 1 2 etc from the find match For example to replace the tag with attributes called tag name with the tag tag namel use as text to find lt tag name s gt and as replace text lt tag name1 1 2 gt 114 Text editor specific actions e Find occurrences of a word or string of characters including white spaces represented on a line or on multiple lines and highlight the position in the editor e Replace occurrences of target defined in the Text to find area with a
59. Desktop on Windows and from the shortcut created on the Linux desktop the maximum memory available to Syncro SVN Client is set by default to 180 MB When started from the command line scripts the maximum memory is 256 MB If large documents are edited in Syncro SVN Client and you see that performance slows down considerably after some time then a possible cause is that it needs more memory in order to run properly You can increase the maximum amount of memory available to Syncro SVN Client by setting the Xmx parameter in a configuration file specific to the platform that runs the application 12 Installation Warning The maximum amount of memory should not be equal to the physical amount of memory available on the machine because in that case the operating system and other applications will have no memory available When installed on a multi user environment such as Windows Terminal Server or Unix Linux to each instance of Syncro SVN Client will be allocated the amount stipulated in the memory value To avoid depreciating the general performance of the host system please ensure that the amount of memory available is optimally apportioned for each of the expected instances Display problems on Linux Solaris Display problems like screen freeze or momentary menu pop ups during mouse movements over screen on Linux or Solaris can be solved by specifying the parameter Dsun java2d pmoffscreen false for the Java virtual machine T
60. Layer xsl Last changed revision 1986 The number of entries is limited in options to 50 x Annotations View of x a sorin 284 2 lines sorin 294 22 lines test 448 1 line sorin 294 2 lines Bj sorin 1986 1 line 48 lt ixsl when gt sorin 294 10 lines 4 lt xsl otherwise gt sorin 284 3 lines 50 lt td valign middle class header text height 20 width 60 gt lt a sorin 1851 3 lines 51 hrefe http iwww oxygenxml com class textSmall target _blank gt 8lt 0X sorin 1886 3 lines 52 lt ftd gt sorin 1851 2 li 53 lt ixslotherwise gt So 54 lt ixsl choose gt sorin 1851 3 lines 55 lt td align right class copyright width 40 gt sorin 1886 1 line 56 lt code lass textSmall gt Copyright c 2002 2007 syncRO soft Itd lt code gt sorin 1851 2 lines 57 lt td gt sorin 284 3 lines 58 lt tr gt sorin 294 193 lines 58 sitable gt a 60 lt div gt oy gt 294 2006 03 24 09 21 33 x 2007 02 06 12 31 03 Corrected Docbook image paths in HTML 1886 2007 01 23 17 33 36 0 name and target of link to home page in the 1851 2007 01 22 15 44 16 it Removed oXygen from SVN Client manual 1380 2006 11 16 17 10 36 sorin Make title of HTML pages of website help a link t 579 2006 05 26 15 17 17 test Removed include of jhCustomLayer 448 2006 05 15 09 47 33 test Documented more new features for release 7 2 294 2006 0
61. Q Terminates Syncro SVN Client Session information such as the current Project open Documents and Option settings is made persistent When Syncro SVN Client is re opened the persistence information returns to the last saved state 117 Chapter 5 Configuring the application Importing Exporting Global Options In the Options menu you can find the Import Export preferences operations which allow you to move your global preferences in XML format from one computer to another Preferences Once the application is installed you can use the Preferences dialog accessed from Options gt Preferences to customize the application for your requirements and network environment There is a search field available in the dialog for selecting only the preferences panels containing required words in the panel title or in the text of a label or a button contained in the panel If you want to go to first match press Enter Up Arrow or Down Arrow Figure 5 1 The Search field from the Preferences dialog 5 Preferences copy X SVN Editor Open Save SVN O Automatically upgrade Messages When switching to an old format working copy O Never upgrade Always ask Y Show tooltip on Working Copy and Synchronize trees C Use unsafe copy operations You can always revert modifications to their default values by using the Restore Defaults button available in each preference page If you don t know how to use a s
62. R 16 AOE E E E E A E A E E EE Ota 16 M m Ment e a a a 17 EA AAA a eg i Bes ae 25 Getino Atlas 26 Define a TE AS OO e 26 Add Edit Remove repository locations ocooococcnonccnonnconncnonncnnn nono conancnoncnnnncnnnnos 26 a AAA a eine en eee Te Bae eines Bae ean Bae AE 27 Definins a WO COP o 28 Cheek A A A 29 DI e od ies e 30 REVISION A A A A Ae A AA A E 30 Usean existing WOrKINE COP 32 Manage working COP TES US Ae 32 O 32 111 Syncro SVN Client 5 1 User Manual Add resources to version Control cee eceesseceeneecesaeeceeaeeceeneeceeneeceeeeeeseeeeeeteeeenaes 33 Ignore resources not under version control eee eeeeeeeesceeeeeeeeceeeeeeeeeeeneeeenaeeees 33 Delete resources siistisi didas 34 Copy Move Rename resources suministran asian eahedaatasestaaoaens 34 Lock Unlock resources ura 35 Scanning fot locks iii ia T iia 36 Locked IEMS iia dd 36 Lockine a Me iii 37 Unlocking a Te oerein a ia 37 Synchronize with the repository sssessssssesssesesssessseesseesseesseresseeesstesseesseesseeesseeesseeso 37 Presentation Modest 38 View Cierences usina lira 41 Resolve CONC 1 ati 43 Real conflicts vs mergeable conflicts oooococnnncccnoncccnoncccnonancnnnnnononcnonananonnnos 43 Content conflicts vs Property conflicts ooooocnnocccnoncccnonccononanonnnncnnnnccnnnnnnnn 43 Edit real content conflicts aniston 44 Revert your Changes ui 46 Merge conflicted resources nuina e aae oai sisi 47 Drop i
63. Syncro SVN Client 5 1 User Manual SyncRO Soft Ltd Syncro SVN Client 5 1 User Manual SyncRO Soft Ltd Copyright 2002 2009 SyncRO Soft Ltd All Rights Reserved Syncro SVN Client User Manual Copyright 2009 Syncro Soft SRL All rights reserved No parts of this work may be reproduced in any form or by any means graphic electronic or mechanical including photocopying recording taping or information storage and retrieval systems without the written permission of the publisher Products that are referred to in this document may be either trademarks and or registered trademarks of the respective owners The publisher and the author make no claim to these trademarks While every precaution has been taken in the preparation of this document the publisher and the author assume no responsibility for errors or omissions or for damages resulting from the use of information contained in this document or from the use of programs and source code that may accompany it In no event shall the publisher and the author be liable for any loss of profit or any other commercial damage caused or alleged to have been caused directly or indirectly by this document Many of the designations used by manufacturers and sellers to distinguish their products are claimed as trademarks Where those designations appear in this book and SyncRO Soft Ltd was aware of a trademark claim the designations have been printed in caps or initial caps While every pr
64. TENSION ai 62 Reimtesrate a branch au ni dia 63 Merge two different trees mr diia an 64 Merge Options said 65 Resolve merge conflicts diiniita dean e 66 Switch the Repository Location msciocnisini identico ariadna irse 67 Relocate a Working Copy si scsicisecctandeecacds ss ceeccascacaateadennctesntccetatedvccteacsseeranteceavess 68 Create Patches miesiocaurini lll iaa lidia 68 Create a patch from working COPY eccoocccconcccnoncccnoncnononcnononanononanononcncnnncnnnnnnnos 69 iv Syncro SVN Client 5 1 User Manual Include unversioned files in the patch 20 0 0 eeeeeeeeceeceseeecseeeeeeteeeeseees 71 Create patch from repository revision ooooooccnocccnonnnonnnnncnonanononcnnnnnccnnnnccnnnnnos 12 Working with repositories viii ida a iris 74 Import Export resources escasa apt ence A En EERE naaa 74 Importing resources into a repository c ccooocccnoccconocnconnnnnnnncnononcnononccnnnncconnncnnns 74 Exporting resources from a repository ccooccccnocccooanccnnncnononcnnnoncnnnonccnnnnccnnnnnos 74 Copy Move Delete resources from the repository oocococccocnconcnonancnoncnoncnnnnnnnnno 75 Sparse checkouts iia aida dada 75 Repository VIEW peene e i tapial ranas 76 General description iss ogs n dd ER ade 76 Tool Dri td 76 Contextual men ACU ONS itetosinsicn psi ini daa T11 Working Copy View iia 79 General description is 79 Working Copy TOMA ii dc EE HESS 80 Refresh a Working Copy intinisniaa a d catasyoeadendagecetaua sen 80 Toolbar
65. TH revision rev specifies the desired revision if necessary PATH is the location on the file system of the resource to update There are two behaviours for the update action in Syncro SVN client If invoked from the Synchron ize View it updates the resources to the HEAD revision If invoked from the Working Copy view it always updates to the HEAD revision Commit svn commit m log message no m log message specifies the commit comment unlock PATH no unlock specifies that the resource should keep locks after commit if this is the case PATH is the location on the file system of the resource to commit Can be more than one Diff svn diff revision revl rev2 PATH _ revision revl rev2 specifies the desired revisions to be compared PATH is the location on the file system of the resource to be compared If you use the Compare with latest from HEAD from the Working copy view you will be comparing the local file with the HEAD revision file If you use Compare with BASE revision the local file will be compared with the pristine copy From the Synchronize view you can compare the working copy file with the HEAD revision file You can choose to compare the local file with an older revi sion or two revisions of the same file from the History view 107 The Syncro SVN Client Show History svn log revision rev1 rev2 revision revl rev2 specifies the range of revisions for limit N verbose PA
66. TH which to obtain the log limit N limits the number of log messages to N verbose gives detailed information about the operation Syncro SVN Client uses by default the limit option in order to obtain only 50 log messages Refresh svn status verbose PATH verbose specifies that the status of all files should be re ported PATH The location on the file system to get status for Synchronize svn status show updates PATH show updates get the resource status by contacting the repository PATH The location on the file system to get status for Import svn import m log message PATH m log message specifies the commit log message URL PATH the local path to the resource on the file system URL the URL on the repository where the resource will be imported Export svn export revision rev URL revision rev specifies the desired revision if necessary PATH URL is the repository URL you want to export from PATH is the location on the file system where to export 108 The Syncro SVN Client Information svn info revision HEAD PATH _ revision HEAD specifies that the information will be for URL the HEAD revision of the resource PATH the local file system path to the resource URL the repository URL for the resource This command can obtain information for a resource from a working copy or from a Subversion repository Add svn add PATH PATH the local file system p
67. Working Copy view or Synchronize view depending on which view was last focused when invoking it e O File Information provides additional information for a selected resource from the Re pository view Working Copy view or Synchronize view depending on which view was last focused when invoking 1t For more details please see the section Obtain information for a resource e Exit Exits the Subversion client Edit 19 Undo undo edit changes in the local file currently opened in the Editor view or the Compare view e Redo redo edit changes in the local file currently opened in the Editor view or the Compare view e X Cut cut selection to clipboard from the local file currently opened in the Editor view or the Compare view Copy copy selection to clipboard from the local file currently opened in the Editor view or the Compare view e Paste paste selection from clipboard in the local file currently opened in the Editor view or the Compare view 18 The Syncro SVN Client 4 Find Replace perform find replace operations in the local file currently opened in the Editor view or the Compare view Find Next go to the next find match using the same find options of the last find operation The action runs in the editor panel and in any non editable text area for example the Console view gt Find Previous go to the previous find match using the same find options of the last find operation The acti
68. action in the context menu from Working Copy View or Synchronize View In the Add to svn ignore dialog you can specify the resource to be ignored by name or by a custom pattern The custom pattern can contain wildcard characters such as e Matches any string of characters of any size including the empty string e Matches any single character For example you may choose to ignore all text documents by using the pattern txt 33 The Syncro SVN Client The action adds a predefined Subversion property called svn ignore to the parent directory of the specified resource In this property there are specified all the child resources of that directory that must be ignored The result will be visible in the Working Copy view The ignored resources will be represented with grayed icons Delete resources The delete command can be found in the Edit submenu of the context menu from the Working Copy View When you delete a resource from the Subversion working copy it will be removed from the file system and it will be also marked as deleted If unversioned added or modified resources will be encountered a dialog will prompt you to confirm their deletion The delete command will not delete from the file system the directories under version control it will only mark them as deleted This is because the directories also contain the pristine copy of that directory content In the Working Copy View this is transparent as all resources will
69. allation 1 Create a folder called syncroSVNClient on your local disk 2 Within the syncroSVNClient folder create child folder named in accordance with the version number of the application The directory structure looks as follows syncroS VNClient 5 1 3 Download the Mac OS X Installation package syncroSVNClient tar gz to this folder 4 Extract the archive to the same folder 5 Execute the file named syncroSVNClient Note Syncro SVN Client uses the first JVM from the list of preferred JVM versions set on your Mac computer that has the version number not less than 1 5 0 To change the version of the Java virtual machine that runs the application you must move your desired JVM version up in the preferred list by dragging it with the mouse on the first position in the list of JVMs available from Applications gt Utilities gt Java gt Java Preferences Procedure 2 3 Linux Installation 1 Download the syncroSVNClient sh installation kit and run it 2 Follow the instructions presented in the installation program Note In order to specify another Java virtual machine to be used by Syncro SVN Client you have to set the home folder of the desired JVM in the environment variable JAVA HOME or in the environment variable JOK_ HOME If JAVA HOME and JDK_HOME are not set the application launcher will try to detect a JVM installed in a standard location on the computer and use it for running the application Instal
70. and Another useful action is Delete This action allows you to delete resources directly from the repos itory After choosing the action from the Repository view contextual menu a confirmation dialog will be displayed All three actions are commit operations and you will be prompted with the Commit message dialog Sparse checkouts Sometimes you need to check out only certain parts of a directory tree For this you can checkout the top folder the action Check Out of Repository view and then update recursively only the needed directories the action Update of Working Copy view Each directory now understands the notion of depth which has four possible values e Recursive infinity Updates all descendant folders and files recursively e Immediate children Updates the directory including direct child folders and files but does not populate the child folders e File children only files Updates the directory including only child files without the child folders 75 The Syncro SVN Client This folder only empty Updates only the selected directory without updating any children Current depth for some operations you can use as depth the current depth of the resource from working copy This is the depth of directories from the working copy it can have one of the values defined above This is the depth value defined in a previous checkout or update operation The sparse checked out directories are marked in the Work
71. ata After the SSH authentication dialog another dialog will pop up for entering the SVN user name that will access the SVN repository and will be recorded as the committer in SVN operations Defining a working copy A Subversion working copy is an ordinary directory tree on your local system containing a collection of files You can edit these files however you wish your working copy being your private work area In order to make your own changes available to others or incorporate other people s changes you must explicitly tell Subversion to do so You can even have multiple working copies of the same project Figure 3 5 Working Copy View Working copy og x SC A UserManual a9 Gg D Projects UserManual A D announce test 2 config 3 css 2 ima lt fals table css z docbook css z0 folds css ge html_cals_table css E 2 developer guide S dist author q site 2 dist authorEclipse 28 The Syncro SVN Client A Subversion working copy also contains some extra files created and maintained by Subversion to help it keep track of your files In particular each directory in your working copy contains a subdirectory named svn also known as the working copy administrative directory This adminis trative directory contains an unaltered copy of the last updated files from the repository This copy is usually referred to as the pristine copy or the BASE revision of the wor
72. ath for the unversioned re sources to be added to version control More than one can be specified Add to svn ignore svn propset svn ignore PATH svn ignore the predefined property name for ignoring PARENTPATH resources PATH the relative path from the working copy root for the resource to be ignored PARENTPATH the path to the parent of the resource to be ignored Delete svn delete recursive PATH IURL recursive specifies that he operation should be per formed recursively PATH the local file system path for the resource to delete URL the repository URL for the resource to delete This command can delete resources from a working copy or from a Subversion repository Copy svn copy SRCPATH DSTPATH SRCPATH the working copy path of the resource to be SRCURL DSTURL copied 109 The Syncro SVN Client DSTPATH the working copy path to be copied to SRCURL the repository path of the resource to be copied DSTURL the repository path to be copied to Move Rename svn move SRCPATH DSTPATH SRCPATH the working copy path of the resource to be SRCURL DSTURL moved DSTPATH the working copy path to be moved to SRCURL the repository path of the resource to be moved DSTURL the repository path to be moved to Mark resolved svn resolved recursive PATH recursive specifies that he operation should be performed recursively PATH the path to the re
73. aultC5S pdf lt o customizeDefaultC55 xml ae dita_default_css_location gif Ee doc_type_association_pref_panel gif iv The full list of the resources that must be synchronized with the repository are presented in a flat list As in the Compressed mode it is useful when you do not want to apply a synchronization operation recursively on a folder 40 The Syncro SVN Client Figure 3 12 Synchronize View Flat mode Synchronize result ES SVN UserManual GS e gt e Oct 4 E Kel UserManual announce test personal schema css A A p UserManual announce test personal schema xml UserManual announce test personal schema xsd UserManual announce test personal css E gt UserManual announce test personal dtd E gt UserManual announce test personal xml AN 2 Taal See f AA gt UserManual announce test personal xsd f leo UserManual announce test personal xsl ey lso UserManual css cals_table css MAA Ta UserManual dist author site articles HowToCustomizeDefa ko a UserManual dist author site articles HowToCustomizeDefa ae UserManual dist author site articles HowToCustomizeDefa a UserManual dist author site articles HowToCustomizeDefa a UserManual dist author site ug author fimg author_track_c a UserManual dist author site ug author fimg bt_dita_defaul UserManual dist author site ug author img sa_advanced_ S4 UserManual dist author site ug authorfimo sa_attributes _ na
74. availability of new Syncro SVN Client versions Browse Syncro SVN Client website opens the Syncro SVN Client website in a browser Register opens the registration dialog Support center opens the Syncro SVN Client Support Center web page in a browser Report problem opens a dialog that allows the user to write the description of a problem that was encountered while using the application About opens the About dialog 24 The Syncro SVN Client Note In order to avoid unusual situations you can currently execute only one action that involves operations with the working copy or with the repository at a time Main toolbar The toolbar of the SVN Client window contain the following actions Figure 3 3 SVN Client toolbar D O d eli Orv e By Check out a working copy from a repository The repository Check Out URL and the working copy format must be specified Z Synchronize the current working copy with the repository Synchronize and display the differences in Synchronize view Update all resources of working copy that have an older re Update All vision that repository ch Commit all resources of working copy that have a new ver Commit All sion than repository O Display the history of selected resource in the History view 2 Show History The selected resource can be in the Working Copy view the Synchronize view or the Repository view Ue Display the annotations of the selected
75. ave Figure 5 7 The Open Save preferences panel Editor Open Save Characters limit for bidirectional text documents 300000 iv Show BIDI limit warning Characters limit for bidirectional text Specify the characters limit for bidirectional text documents documents If the number of characters in document exceeds this limit the bidirectional support will be disabled Show BIDI limit warning If checked a warning dialog will be shown when the opened file which contains bidirectional characters is too large and bidirectional support is disabled Consider application bundles to be This option is available only on the Mac OS X platform directories when browsing When checked the file browser dialog allows browsing inside an application bundle as in a regular folder When unchecked the file browser dialog does not allow browsing inside an application bundle as the Finder application does on Mac 124 Configuring the application OS X The same effect can be obtained by setting the prop erty apple awt use file dialog packages to true or false in the Info plist descriptor file of the lt oXygen gt applica tion by adding two lines in this descriptor file lt key gt apple awt use file dialog packages lt key gt lt string gt false lt string gt SVN The SVN preferences panel is opened from menu Options gt Preferences SVN and it is the place where the user preferences for the embedded SVN client tool are conf
76. branches even if they do not share a common ancestry Normally the branch and the trunk or the two branches that are merged must have a common ancestor revision in the same re pository In case the two merged trees were imported in the repository they are not related in the sense of a common ancestor tree and the merge operation is possible by ignoring the missing common ancestry of the two merged trees The Ignore line endings and Ignore whitespaces checkboxes allow you to specify how the line endings and whitespace changes should be handled If they are checked the changes due only to the line endings and whitespaces are ignored The default behavior is to treat all whitespace and line end differences as real changes to be merged Ignore whitespace changes excludes changes which are caused by a change in the amount or type of whitespace for example changing the in dentation or changing tabs to spaces Adding whitespace where there was none before or removing a whitespace completely is still shown as a change If Ignore all whitespaces is checked all whitespace only changes are excluded If you are using merge tracking support and you want to mark a revision as having been merged without actually doing the merge here check the Only record the merge checkbox You might want to do this for two possible reasons You make 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
77. by going to menu Help Check for New Versions 11 Installation Uninstalling the application 4 Caution The following procedure will remove Syncro SVN Client from your system Please ensure that all valuable data is saved to another location prior to performing this procedure Procedure 2 12 Uninstall Procedure 1 Backup all valuable data from the Syncro SVN Client installation folder 2 On Windows use the appropriate uninstaller shortcut provided with your OS On Mac OS X and Unix manually delete the installation folder and all its contents 3 If you wish to completely remove the application directory and any work saved in it you will have to delete this directory manually To remove the application configuration and any per sonal customizations remove the 3APPDATA com syncrosvnClient directory on Windows usually APPDATA has the value user home dir Application Data com syncrosvnClient on Linux Library Preferences com syncrosvn Client on Mac OS X from the user home directory Unattended uninstall If you want to run an unattended uninstall this is possible only on Windows and Linux by running the uninstaller executable from command line and passing the q parameter The uninstaller execut able is called uninstall exe on Windows and uninstall on Linux and is located in the install folder of the application Performance problems Large documents When started from the icon created on the Start menu or the
78. c ations The order of the repositories can be changed in the Repository view at any time with the two buttons on the toolbar of the view the up arrow and the down arrow For example pressing the up arrow once moves the selected repository up in the list with one position 26 The Syncro SVN Client To set the reference revision number of a SVN repository right click on the repository in the list displayed in the Repository View and select the Change the Revision to Browse action The revision number of the repository set with this dialog will be used for displaying the contents of the repository when it is viewed in the Repository View only the files and folders that were present in the repository at the moment when this revision number was generated on the repository are displayed as contents of the repository tree Also this revision number is used and for all the file open operations executed directly from the Repository View Authentication Five protocols are supported HTTP SVN HTTPS SVN SSH and FILE If the repository that you are trying to access is password protected the Enter authentication data dialog will request a username and a password If the Store authentication data checkbox is checked the credentials will be stored in Subversion s default directory e Windows SHOMESXApplication Data Subversion auth Example C Documents and Settings John Application Data Subversion auth e Linux amp Mac
79. ceived from the SVN server is created in the same working copy folder as the file with the edited conflicts The name of the backup file is obtained by appending the extension sync bak to the file as stored on the SVN server If you press the Cancel button the visual editing will be aborted The usual operations on the differences between two versions of a file are available on the toolbar of this view Save Save the modifications of the local version of the file dis played in the left side of the view Perform Files Differencing Apply the diff operation on the two versions of the file dis played in the view It is useful after modifying the local version displayed in the left side of the view Go to First Modification Scroll the view to the topmost difference Go to Previous Modification Scroll the view to the previous difference The current dif ference is painted with a darker color than the other ones Go to Next Modification Scroll the view to the next difference The current difference is painted with a darker color than the other ones Go to Last Modification Scroll the view to the last difference Copy All Non Conflicting Changes Not applicable for editing conflicts so it is disabled from Left to Right Copy Change from Left to Right Not applicable for editing conflicts so it is disabled Copy Change from Right to Left Copy the current difference from the left side to the right side by replacing the highlighted text of the
80. ch is created only on the selected folder that is no child file or folder is in cluded in the patch The SVN ancestry that may exist when the two URLs specified for creating the patch have acommon SVN history is ignored when the patch is created The differences in line endings are ignored when the patch is created The differences in whitespaces are ignored when the patch is created The patch will be created and saved in clipboard The patch will be created and saved in the specified file Include unversioned files in the patch In the next step you can specify the unversioned files that will be included in the generated patch If the patch is applied on a folder of the working copy and that folder contains unversioned files this step of the wizard offers the option of selecting the ones that will be included in the patch 71 The Syncro SVN Client Figure 3 28 Patch between working copy and repository step 4 8 Create patch E Do you want to add the following unversioned resources in the patch Ttems Resource State Properties state workspace test SVN autocomplete php unversioned none e workspace test SVN Form php unversioned none workspace test SVN index html unversioned none workspace test SVN office xml lunversioned none workspace test SVN query sql lunversioned none workspace test SVNschema xsd unversioned none workspace test SVN template xsl unversioned none workspace test SVN text txt unversioned
81. ch the new external folder will point and the revision number of that repository URL can be selected easily with the Browse and History buttons of the dialog Subversion clients 1 5 and higher support relative external URLs You can specify the repos itory URLs to which the external folders point using the following relative formats e Relative to the URL of the directory on which the svn externals property is set e A Relative to the root of the repository in which the svn externals property is versioned Relative to the scheme of the URL of the directory on which the svn externals property is set e Relative to the root URL of the server on which the svn externals property is versioned Open This action will open the selected file in an editor where you can make modifications to it The action is active only when a single item is selected In case of a file the action opens the file with the internal editor or the external application associated with that file type In case of a folder the action opens the selected folder with the system application for folders for example Windows Explorer on Windows Finder on Mac OS X etc e Open with Displays the Open with dialog for specifying the editor in which the selected file will be opened In case multiple files are selected only external applications can be used to open the files e Edit e Copy This action copies resources from the working copy
82. commit comment before sending your changes to the repository Revert Undoes all local changes for the selected resources It does not contact the repository the files will be obtained from Subversion s pristine copy It is enabled only for modified resources Read the Revert your changes section for more information 83 The Syncro SVN Client e Edit conflict opens a Compare view for editing the selected conflict For more information on editing conflicts please see Edit conflicts section e Mark resolved This action is only enabled on conflicted resources and its function is to tell the Subversion system that you resolved the conflict See the section Merge conflicts e Compare with e Latest from HEAD This action will perform a 3 way diff operation between the selected file and the HEAD revision from the repository and will display the result in the Compare view The common ancestor of the 3 way diff operation is the BASE version of the file from the local working copy BASE revision This will compare the working copy file with the file from the pristine copy BASE revision e Revision This command will bring to front the History view with the log history for that re source e Branch Tag This will compare the working copy file with a revision of the file from a branch or tag The revision is specified by URL selected with a repository browser dialog and revision number selected with a revision browser dialo
83. current differ ence from the left side with the one from the right side Copy All Non Conflicting Changes Apply the previous operation for all the differences from Right to Left Show Modification Details at Word Display a more detailed version of the current difference Level computed at word level 45 The Syncro SVN Client Show Modification Details at Char Display a more detailed version of the current difference Level computed at character level Ignore Whitespaces The text nodes are normalized before computing the differ ence so that if two text nodes differ only in whitespace characters they are reported as equal The operation begins by overwriting the conflict version of the file received from the SVN server the version which contains the conflict markers lt lt lt lt lt lt lt gt gt gt gt gt gt gt with the original local version of the file before running the update action which created the conflict After that the differences between this original local version and the repository version are displayed in the Compare view If you want to edit the conflict version of the file directly in a text editor instead of the visual editing offered by the Compare view you should work on the local working copy file after the update op eration without running the action Edit Conflict If you decide that you want to edit the conflict version directly after running the action Edit Conflict you have to work on the
84. d XML Accurate work for XML documents If you ll try to use them for other types of files you ll be prompted with the message content not allowed in prolog Ignore whitespaces LCS Maximum number of differ ences XML Diff Options This option if checked allows the diff algorithm to ignore the whitespaces Ignoring whitespace means that before the strings are compared they are first normalized and then the whitespace at the beginning and the end of the strings is trimmed This option allows you to specify the maximum number of differences between your documents that you might be inter ested to see using the Longest Common Subsequence Al gorithm If the number of differences is larger than the one specified here you ll be notified by the message Too many differences This set of options allows you to specify the types of differ ences that will be ignored in the XML Fast and XML Accur ate algorithms e in node type e Processing instructions e Comments e CDATA DOCTYPE 130 Configuring the application e Text e in namespaces prefixes e Namespaces e Prefixes e Namespace declarations e in the attributes order Merge adjacent differences If checked it considers adjacent differences as one and they are presented in this way in the side by side editors If un checked every difference is represented separately Mark end tags as different for modi If checked end tags of modified elements are present
85. directory e Show SVN Properties brings up the Properties view and displays the SVN properties for the selected resource e Y File Information provides additional information for the selected resource from the working copy For more details please see the section Obtain information for a resource Icons The icons for the items displayed into the synchronized trees are the same icons used in the Syncro SVN Client decorated with overlay images The overlay icons correspond to the status of the resource as follows Incoming resource resource with incoming changes Remote added resource resource that was added on the repository and is not present in your working copy Remote deleted resource resource that no longer exists in the repository Outgoing resource resource with outgoing changes e Locally added or unversioned resource resource added locally to version control or a resource not yet under version control 91 The Syncro SVN Client Locally deleted or missing resource a resource that you deleted with Delete action or that was deleted from the file system in some other way Conflicting resource resource in a pseudo or real conflicting state Compare View Description In the Syncro SVN Client there are three types of files that can be checked for differences text files image files and binary files For the text files and image files you can use the built in Compare
86. e etc If the tooltips seem annoying by covering useful information they can be disabled from the option Show tooltip on Working Copy and Synchronize trees Toolbar The Synchronize view toolbar consists of the following buttons Synchronize last repeats the last synchronize action Incoming Mode filters synchronized resources displaying only the ones with incoming changes gt Outgoing Mode filters synchronized resources displaying the ones with outgoing changes In Out Mode displays resources with incoming or outgoing changes basically all resources with any type of change Conflicts Mode filters synchronized resources displaying the ones in pseudo or real conflict state of Update All updates all resources with incoming changes It is disabled when Outgoing mode is selected or the synchronization result does not contain resources with incoming changes It will perform a recursive update on the synchronized resources Commit All commits all resources with outgoing changes It is disabled when Incoming mode is selected or the synchronization result does not contain resources with outgoing changes It will perform a recursive commit on the synchronized resources Expand All expands all the descendant nodes of the node currently selected in the view Collapse All collapses all the descendant nodes of the node currently selected in the view Contextual menu actions The contextual menu con
87. e and its content is the correct one you can decide to drop some or all of the incoming changes and commit afterwards The action Mark as merged proves to be useful in this case too After opening the conflicting files with Compare view Editor or editing their properties in the Properties view and deciding that your file can be committed in the repository replacing the existing one you should first use Mark as merged action When you want to override completely the remote file with the local file you can use Override and commit which drops any remote changes and commits your file In general it is much safer to analyze all incoming and outgoing changes using Compare view and only after to update and commit Tree conflicts A tree conflict is a conflict at the folder level and occurs when the user runs an update action on a file but the file does not exist in the repository anymore because other user renamed the file moved the file to other folder or deleted the file from repository The same conflict situation can occur at folder level in a merge action or switch action The action ends with an error and the folder containing the file that exists now only in the working copy is marked with a conflict icon Such a conflict can be resolved in one of the following ways which are available when the user double clicks on the conflict in the Synchronize view or when he runs the action Edit conflict 48 The Syncro SVN Client Figure 3 15
88. e of metadata which grants exclusive access to a user This user is called the lock owner A lock is uniquely identified by a lock token a string of characters If someone else attempts to commit the file or delete a parent of the file the repository will demand two pieces of information e User authentication The user performing the commit must be the lock owner e Software authorization The user s working copy must have the same lock token as the one from the repository proving that it is the same working copy where the lock originated from Scanning for locks When starting to work on a file that is not contextually mergeable usually a binary file it is better to verify if someone else isn t already working on that file You can do this in the Working Copy View by selecting one or more resources then right clicking on them and choosing the Scan for locks action from the context menu Locked items Figure 3 8 The locked items dialog Locked items ritems Path State Owner Comment Creation Date Expiration Date jsamplesSvn1 debugger 1 Conditional process Locked test locked 5 19 06 3 45 PM samples5vn1 debugger1 Copying sample1 xsl Broken test locked 5 19 06 3 45 PM samplesSvn1 debugger1 Copying sample1 xml Stolen test stolen lock 5 19 06 3 47 PM samplesSvni debugger 1 Combining styleshe Other test locked 5 19 06 3 48 PM The Locked items dialog contains a table with all the r
89. e old format that is the SVN 1 5 SVN 1 4 or SVN 1 3 one a confirmation dialog is displayed allowing the automatic conversion to the working copy to the new format that is the SVN 1 6 one If you select the Never ask me again checkbox and press the Yes button then the option Automatically upgrade working copies to the client s version is automatically checked The format of the working copy can be downgraded or upgraded at any time with the actions Up grade and Downgrade available on the Tools menu These actions allow switching between SVN 1 4 SVN 1 5 and SVN 1 6 working copy formats Refresh a Working Copy A refresh is a frequent operation that happens when you switch between two working copies using the selector from the toolbar of the Working Copy view and when you switch between Syncro SVN Client and other applications For fast refresh in the Working Copy view the content is cached locally on the first load of a working copy Later when the same working copy is loaded again in the view or when you switch back to the Syncro SVN Client window the cache is used for detecting the changes between the cached content and the current content from disk This improves the speed 80 The Syncro SVN Client for large working copies because it detects the changes from disk after the last refresh and runs the refresh only for the changes Toolbar The toolbar from the working copy view contains the following buttons Synchronize co
90. e selected path is not under version control the newly created file will not be added to version control This action works only for selected paths in the Working Copy tree e New Folder This operation creates a new folder as child of the selected folder from the Repository View tree or from the Working Copy View tree depending on which view was focused last when performing this action For Working Copy View the folder will be added to version control only if the selected path is under version control otherwise the newly created directory will not be added to version control e New External Folder This operation sets a folder name in the property svn externals of the selected folder The repository URL to the folder to which the new external folder will point and the revision number of that repository URL can be selected easily with the Browse and History buttons of the dialog This action works only for selected paths in the Working Copy tree Subversion clients 1 5 and higher support relative external URLs You can specify the re pository URLs to which the external folders point using the following relative formats e Relative to the URL of the directory on which the svn externals property is set e A Relative to the root of the repository in which the svn externals property is versioned e Relative to the scheme of the URL of the directory on which the svn externals property is set 17 The Syncro SVN Client
91. e working copy resource This action is only enabled when the resource history was requested for a working copy item For more information about the History view and its features please read the sections Request history for a resource and Using the resource history view Annotations View Description Sometimes you need to know not only what lines have changed but also who changed specific lines in a file This view displays the author and the revision that changed every line in a file Just click on a line in the editor panel where the file is opened to see the revision that edited that line last time highlighted in the History view and to see all the lines changed by that revision highlighted in the editor panel Also the entries of the Annotations view corresponding to that revision are highlighted So the Annotations view the History view and the editor panel are synchronized Clicking on a line in one of them highlights the corresponding lines in the other two 98 The Syncro SVN Client Figure 3 36 The Annotations View 43 lt xsI choose gt 47 lt ftd gt 51 lt ixsitemnlate gt 4 History http 10 0 0 2 svn repos userquide trunk htmlCustomLayer xsl Revision 1986 o 4 xslwhen test profile os svnclient gt 46 std valign middle class header text height 20 width 60 gt lt a 46 hret http www syncrosynclient com class textSmall target _blank El it 193 ol A History For htmlCustom
92. each application instance Please make sure you tune them in a way that the multiple editor instances won t use all the available physical memory Installation Procedure 2 6 Unix Linux Server 1 Install the editor on the server making sure the syncroSVNClient sh script is executable and the installation directory is in the PATH of the users that need to use the editor 2 Create a file called syncroSVNClient vmoptions in the Syncro SVN Client install folder where the syncroSVNClient5 1 file is located The content of the file must be Xmx256m Dcom oxygenxml Multiplelnstances true The Xmx value represents the maximum memory for each editor instance Please make sure you tune it in a way that the multiple editor instances won t use all the available physical memory 3 Make sure the X server processes located on the workstations allow connections from the server host For this use the xhost command 4 Telnet or ssh on the server host 5 Start an xterm process with display on the workstation Ex xterm display workstationip 0 0 6 Start the application by typing syncroSVNClient sh Unattended installation Unattended installation is possible only on Windows and Linux by running the installer executable from command line and passing the q parameter The installer executable is called syncroSVN Client exe on Windows and syncroSVNClient sh on Linux In unattended mode the installer does not overwrite file
93. eader to sort the table by that column The modifications that will be committed for each file can be reviewed in the compare editor window by double clicking on the file in the Commit dialog or by right clicking and selecting the action Show Modifications If you have modified files which have been included from a different repository using svn externals those changes cannot be included in the same commit operation 51 The Syncro SVN Client Note If the working copy is located on other computer and is accessed through Samba some files for which SVN properties are set will have a size of zero bytes in the working copy after the commit operation This is caused by a failed action of creating a backup copy of the committed file which is caused by some Samba delays in write operations You can avoid this problem by adding the startup parameter Dsvnkit no safe copy true Integration with Bug Tracking Tools Users of bug tracking systems can associate the changes they make in the repository resources with a specific ID in their bug tracking system When the user enters a commit message the bug ID is added to this message The format and the location of the ID in the commit message are configured with SVN properties To make the integration possible Syncro SVN Client needs some data about the bug tracking tool used in the project You can configure this using the following SVN properties which must be set on the folder containing re
94. ecaution has been taken in the preparation of this book the publisher assumes no responsibility for errors or omissions or for damages resulting from the use of the information contained herein Third party software components are distributed in the Syncro SVN Client installation packages including the Java Runtime Environment JRE This product includes software developed by the Apache Software Foundation http www apache org http www apache org Xerces XML Parser These products are not the property of SyncRO Soft Ltd To the best knowledge of SyncRO Soft Ltd owners of the aforesaid products granted permission to copy distribute and or modify the software and its documents under the terms of the Apache Software License Version 1 1 Other packages are used under the GNU Lesser General Public License Users are advised that the JRE is provided as a free software but in accordance with the licensing requirements of Sun Microsystems Users are advised that SyncRO Soft Ltd assumes no responsibility for errors or omissions or for damages resulting from the use of Syncro SVN Client and the aforesaid third party software Nor does SyncRO Soft Ltd assume any respons ibility for licensing of the aforesaid software should the relevant vendors change their terms By using Syncro SVN Client the user accepts respons ibility to maintain any licenses required by SyncRO Soft Ltd or third party vendors unless SyncRO Soft Ltd declares in writing that the
95. ed as fied elements differences Ignore expansion state for empty If checked empty elements in both expansion states are elements considered matched For the directories comparison you can specify the criterion for the component files comparison and a default file filter Directories Comparison Look in archives If checked the Diff directories comparator will treat archives known by Syncro SVN Client as directories and show differences also between files inside them Compare files by The methods used to compare the files in diff directories e Content The files content is compared using the current diff al gorithm Also all the xml diff options are used at comparison e Binary Compare The files are compared at byte level e Timestamp last modified date time The files timestamp is compared Default file filter specifies the file filter that is set by default in the File filter combo box of the Compare Directories window each time this window is opened from the Jools menu 131 Configuring the application Diff Appearance The Diff Appearance preferences panel is opened from menu Options Preferences Diff Appear ance Figure 5 12 The Diff appearance preferences panel Diff Appearance C Line wrap Colors Incoming olor Cd Outgoing calor Cd coito Cd Line wrap If checked the lines presented in the two diff panels are wrapped at the right margin of each panel so that no horizontal
96. ed the format of an older working copy by using a newer SVN client See Working Copy format to read more about this subject e Layout layout control actions e Show View allows you to select the view you want to bring to front e Show Toolbar allows you to select the toolbar you want to be visible 23 The Syncro SVN Client Reset Layout resets all the views to their default position Options Preferences opens the preferences dialog Menu Shortcut Keys opens the preferences dialog directly on the Menu Shortcut Keys option page where users can configure in one place the keyboard shortcuts available for menu items available in Syncro SVN Client Global Run Time configuration allows you to configure SVN general options that should be used by all the SVN clients you may use e Edit config file in this file you can configure various client side behaviors e Edit servers file in this file you can configure various server specific protocol parameters including HTTP proxy information and HTTP timeout settings Export Options allows you to export the current options to a file Import Options allows you to import options you have previously exported Reset Options resets all your options to the default ones Reset Authentication resets the Subversion authentication information Help Dynamic Help shows the Dynamic Help dialog Help opens the Help dialog Check for New Versions checks the
97. einna u E a 114 Keyboard shortcuts for finding the next and previous match 1 0 0 0 eeeeeeeeeeeeeteeeees 117 vi Syncro SVN Client 5 1 User Manual Dragging and dropping the selected text eccceesseceeseceeneeceeneeceeneeceeeeecseeeecseeeecsteeeenaeees 117 Exiti g the application ii cdi 117 5 Configuring the application avescccssscerecenpaceddedsssnecessncasves ees canavasdease tveadaaveskedesdasnetaapesudealonsvocesse 118 Importing Exporting Global Options 20 0 cee ceecceeescecesececeeneeceeeeecseceeceeeeecsueeeeneeeeneeeenaees 118 PIELES a 118 Global turis 119 OS oL eE cesta sous tities Mild sie pga eet aaeetilele ci peak tia ali cn ies S 121 FC OGL G inside 122 BOOK e baat thie ie hee nae uae A ee ntina bes 123 Opens SAVE nilo 124 SVN A atea aaa daa Ea ae aE aT A A e aa AEE Aaaa pea a E aae 125 Working COPY asun ij diia S 127 Did Ati 128 Diff from lt oXygen gt XML Diff vencido iaa atenci n 129 Diff Appearance ua a Ea 132 Archive from lt oXygen gt XML Diff sssessssssesssessssseesseessesssessseeessseesseesseesseessseesssees 132 Menu Shortcut Keys isrener a eeto na E A E R E EE a Aet 134 SVN File Editors cunda e aa RE TEE Ea Gc 135 HTTP Proxy Configuration iii eR eae ee 138 Messages from lt oXygen gt XML Diff eee eeeececseneeceseeeceeeeeceeeeecseeeecseeeeeeeeeees 139 MESAS sl ra 140 Reset Global OPS sia 140 6 COMMON problems mini aci n 141 ndek usan ti ti RS 142 vil Chapter
98. erences panel Diff Default algorithm Auto Mm C Ignore whitespaces LCS Maximum number of differences 1000 XML Diff Options Ignore modifications in Node Type Namespaces Prefixes O Processing Instruction a Namespaces C Comments _ Prefixes C Data C Namespace declarations C DOCTYPE Order C Text C Attribute order C Merge adjacent differences C Mark end tags as different For modified elements C Ignore expansion state for empty elements Directories Comparison C Look in archives Compare files by O Content O Binary Compare 2 Timestamp last modified date time Default algorithm Select from the list the algorithm that will be used as default when you open the Compare files dialog e Auto makes an automatic selection of the diff algorithm based on the files content and size 129 Configuring the application e Characters computes the differences at character level e Words computes the differences at word level e Lines computes the differences at line level e Syntax aware for the file types known by Syncro SVN Client this algorithm computes the differences taking into consideration the syntax of the documents e XML Fast is designed for XML documents It works better than XML Accurate on large files but it is less precise e XML Accurate is designed for XML documents It works best on smaller XML files and it is most precise Note XML Fast an
99. es are computed using a line differencing algorithm The view can be used to show the differences between two files in the following cases e After obtaining the outgoing status of a file with a Refresh operation the view can be used to show the differences between your working file and the pristine copy In this way you can find out what changes you will be committing e After obtaining the incoming and outgoing status of the file with the Synchronize operation you can examine the exact differences between your local file and the HEAD revision file e You can use the Compare view from the History view to compare the local file and a selected revision or compare two revisions of the same file 92 The Syncro SVN Client If in any of the cases one of the involved files cannot be loaded then you will be prompted with a dialog informing you about the file that cannot be opened The Compare view contains two editors Edits are allowed only in the left editor and only when it contains the working copy file To learn more about how the view can be used in the day by day work you can read the section View differ ences Toolbar The list of actions available in the toolbar consists of bl Save action it allows you to save the content of the left editor when it can be edited Perform files differencing used to perform files differencing on request Go to first modification used to navigate to the first difference T Go to previous
100. esent a more detailed compare result Word Details and Character Details When you want to examine only the changes in the real text content of the files disregarding the changes in the number of white spaces between words or lines there is available an option which allows you to enable or disable the white space ignoring feature of the compare algorithm Resolve conflicts Once in a while you will get file conflicts when you update your files from the repository A file conflict occurs when two or more developers have changed the same few lines of a file or the properties of the same file As Subversion 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 try to analyse and resolve the conflicting situation Real conflicts vs mergeable conflicts There are two types of conflicts The real conflict conflicted state is obtained when a file in the working copy has incoming and outgoing changes in the same section When updated the differences cannot be merged automatically so the file is marked as conflicted A file can be in real conflict state when its content or its properties are in conflict A folder can be in real conflict only when its properties are in conflict A file is in a mergeable conflict state when it contains both incoming and outgoing changes not necessarily in the same sections A file is in mergeable conflict when its conte
101. esources that were found locked on the repos itory For each resource there are specified resource path state of the lock owner of the lock lock comment creation and expiration date for the lock if any The state of the lock can be one of e Other if someone else locked the file e Locked if you locked the file e Broken if you locked the file but it was forcefully unlocked by someone else afterwards e Stolen if you locked the file but it was forcefully locked by someone else afterwards You can unlock a resource by selecting it and pressing the Unlock button 36 The Syncro SVN Client Locking a file A locked file allows you exclusive write access to a file from the repository meaning that you are the only one who can modify and commit the file to the repository You can lock a file from the context menu in Working Copy View Note that you can only lock several files at once but no directories This is a restriction of Subversion which is used to discourage the use of the lock modify unlock model at large scale or when unnecessary In the Lock dialog you can write a comment for the lock and if necessary steal force the lock Note that you should only steal a lock after you made sure that the previous owner no longer needs it otherwise you may cause an unsolvable conflict which is exactly why the lock was put there in the first place The Subversion server can have a policy concerning lock stealing it may not al
102. esseeeseeeesseesstesse 107 Checkout ind 107 Update ana ii 107 COM al 107 Di rai 107 SHOW HIS nos 108 A nk Aaa pase a sE TA dels N acta 108 Synchronize seasc areen E E E EAE E REEE e E AE a aS 108 IMPOR uni ii e 108 EXPO cd 108 Infort oN cai a ai 109 NOG E E T E E 109 Add t SVICIS OTS aiii data U ER A ER RRA 109 Delet a e ea EE E A A a a aaa a Ea 109 COPY al ia 109 Move Rena id 110 Mark reso edu ii 110 JEA E E 110 CEA ya e a A R ee RER A ee 110 Show Refresh Properties ssssseesssessesssessseeeeseeesseessersseesseeessseesseesseesseesseeesseee 110 Branch Tal narra aida 111 Merge coi 111 SCam LOE LOCKS ii is di 111 Eea E E O 112 Unlock innen naa R R E E EE RES 112 Mark s Merged io S 112 Override and update aiii i r i E E E a a E ne 112 Override and commit sssini isidin s i e EESE E ES Ea e ENES 112 Add Edit property veria nnn a i ina 112 Remove PLOP Vii Anand 113 Revert changes from this revision 4 s ccc caseaecisvssadaveesccevasgevad sade scacebunsdeaseusedantenes 113 Revert changes from these revisions vii 113 4 Text editor specific ACU OMS resaca rica drid dina leida epi ideas abans 114 Undoing and redoing user actions sica se deauseauersneusndecesanbesaatesebanetosecs 114 Copying and pasting text A deecdacssedeacevacdccadssecsantedesddeceseaeaaeasssaataneancns 114 Finding and replacing text in the current file oooononococinococioncccnonccononanononaconnncnnonnccnanncanns 114 The Pind Replace dilog init
103. esult will be displayed in the Synchronize view The action invokes the associated operation from the Working Copy view or from the Synchronize view depending on which was last focused when performing it If Working Copy view was last focused then the synchronize operation will be performed on the selected resource s from the working copy or on the working copy root if no resource s selected On Synchronize view the action will synchronize the root of the last synchronized resources who s path is displayed on the view s header Refresh refreshes re scans the content of the working copy The action performs a refresh operation on the selected the selected resource s from the working copy or on the root of the working copy if no selection e A Cleanup performs a maintenance cleanup operation on the selected folder s from the working copy or on the whole working copy if no selection e Update updates all the selected resources that have incoming changes to the HEAD revision If one of the selected resources is a directory then the update for that resource will be recursive This operation is context dependent which means that will be performed on the selected re source s from the Working Copy view or from the Synchronize view depending which was last focused when it was invoked e Update to revision depth This action allows you to update the selected resources from the working copy to an earlier revision from the repositor
104. et via the Proxy Service The Proxy Configuration dialog enables this configuration If you are not sure whether your computer is required to use a Proxy server to connect to the Internet or the values required by the Proxy Configuration dialog please consult your Network Administrator Open the HTTP Proxy Configuration panel by selecting Options Preferences HTTP Proxy Configuration Figure 5 18 The HTTP Proxy Configuration preferences panel HTTP Proxy Configuration O Direct connection Use system settings 2 Manual proxy configuration Web Proxy HTTP HTTPS Address 10 0 0 2 Port 3128 No proxy for Web Proxy authentication HTTP HTTPS User Password SOCKS Proxy Port 9000 HTTPS Connections C SSL authentication with dient certificate Advanced HTTP Settings Read timeout s 20 Complete the dialog as follows Direct connection When checked the HTTP and HTTPS connections go directly to the target host without going through a proxy server Use system settings When checked the HTTP and HTTPS connections go through the proxy server set in the operating system For example 138 Configuring the application Manual proxy configuration Web Proxy authentication HTTP HTTPS SOCKS Proxy SSL authentication with client certi ficate Read Timeout s on Windows the proxy settings are the ones available in In ternet Explorer Warning The system settings for
105. evision dependent After you change add or delete a property for a resource you have to commit your changes to the repository Add Edit Remove SVN properties If you want to change the properties of a given resource you need to select that resource from the Working copy view or the Synchronize view and access the Show properties action from the con textual menu The properties view will show the local properties for the resource in the working copy Once the Properties View is visible it will always present the properties of the currently se lected resource In the Properties view toolbar there are available actions which allow you to add change and delete the properties If you choose the Add a new property action a new dialog will pop up The sections in the dialog are e Name it is a combo box which allows you to enter the name of the property The drop down list of the combo box presents the predefined Subversion properties such as svn ignore svn ex ternals svn needs lock etc e Current value it is a text area which allows you to enter the value of the new property If the selected item is a directory you can also set the property recursively on its children by checking the Set property recursively checkbox If you want to change the value for a previously set property you can use Edit property action which will display a dialog where you can set e Name the property name It cannot be changed only its value can
106. f text which you already modified in the local file has been modified and committed by some other person They are marked with ared highlight and red diamonds on the divider There are numerous actions and options available in the Compare View toolbar or in the Compare menu from the main menu You can decide that some changes need adjusting or that new ones must be made After you perform the adjustments you may want to perform a new compare between the files For this case there is an action called Perform files differencing After each files differencing operation the first found change will be selected You can navigate from one change to another by 42 The Syncro SVN Client using the actions Go to first Go to previous Go to next Go to last modification If you decide that some incoming change needs to be present in your working file you can use the action Copy change from right to left This is useful also when you want to override the outgoing modifications contained in a conflicting section The Copy all non conflicting changes from right to left copies all incoming changes which are not contained inside a conflicting section in your local file Let us assume that only a few words or letters are changed considering that the differences are performed taking into account whole lines of text the change will contain all the lines involved For finding exactly what words or letters have changed there are available two dialogs which pr
107. f you want to merge two different trees 61 The Syncro SVN Client Merge revisions This is 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 or trunk An example of such operation can be the following Calculate the changes necessary to get from revision 17 of branch B1 to revision 25 of branch B1 and apply those changes to my working copy of the trunk or another branch Figure 3 21 Merge revisions range dialog E Merge EJ Revision range to merge From URL http decebal sync ro svnjrepos userquide trunk v Revision range to merge All revisions Revision range Example 1 3 5 7 10 HEAD C Reverse merge Target Working copy E current projects userquide The corresponding repository URL http idecebal sync ro svn repos userguide trunk Enter the folder URL of the branch or tag containing the changes you want to port into your working copy In the From field You may also click the Browse button 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 In the Revision range to merge section you can choose to merge all revisions or enter the list of revisions you want to merge in the Revision range field This can be a single revision a list of com
108. g e Each other This action only works when two files are selected It will compare the two selected files with each other These actions are enabled only if the selected resource is a file e Replace with e Latest from HEAD This action will try to replace the selected resources with their versions from the HEAD revision of the repository e BASE revision This action will try to replace the selected resources with their versions from the pristine copy the BASE revision The dialog above is presenting the resources that have content or properties locally modified so that the user will be aware that will lose any uncommitted changes Note In some cases it is impossible to replace the current selected resources with their versions from the BASE HEAD revision For Replace with BASE revision action the resources being unversioned or added have no BASE revision but when selecting a parent folder of this type of resources they will be removed The action will never work for missing folders or for obstructing files folders being obstructed by a file because you cannot recover a tree of folders 84 The Syncro SVN Client For Replace with latest from HEAD action you must be aware that any resource being un versioned added obstructed modified currently added to svn ignore or currently being present in the working copy as a result of updating a folder on which was added a svn ex ternals property without these p
109. g 843 DeveloperGuide pdf ge DeveloperGuide xml iv The resources are presented in a layout with two levels that is a com pressed path for each folder in the list as in the following image This mode is useful when you need the full list of resources which need syn chronization without having to expand a tree to get to the unsynchronized resources of that folder Also it is useful when you do not want to apply a synchronization operation recursively that is the operation applied to a folder resource must not have any effect on other unsynchronized resources located in the folder but displayed in other list entries in the view 39 The Syncro SVN Client Flat mode Figure 3 11 Synchronize View Compressed mode Synchronize result x SVN UserManual 5 30 T Ey 6 0 css a go gt cals_table css 4 14 dist authorEclipse site H D dist authorEclipse site articles HowToCustomizeDefault T 0 dist authorEclipse site ug authorEclipse H D dist authorEclipse site ug authorEclipsefima 4 10 dist authorEclipse site ug author fima H 0 dist authorEclipse site ug oxygen 4 14 dist authorEclipse site ug oxygenEclipse 6 14 dist authorEclipse site ug oxygenEclipse ima W D dist authorEclipse sitefug oxygenfimg 5 0 dist author site a Author UserManual pdf Ta AuthorEclipse UserManual pdf Ta Oxygen UserManual pdf 4 OxygenEclipse UserManual pdf S dist author site articles HowToCustomizeDefaultCS5 TA customizeDef
110. g which displays the working copies the Subversion client is aware of In this dialog you can add existing or remove no longer needed working copies If you try to add a directory which is not a valid Subversion working copy a warning dialog will inform you that the selected directory is not under version control Please note that removing a working copy from this dialog will NOT remove it from your file system you will have to do that manually Show ignored files shows in the working copy tree the resources that were listed in the svn ignore property of their parents This option is off by default Show deleted files shows in the working copy tree the resources that were marked to be deleted but are not yet committed This option is off by default Contextual menu actions The contextual menu in the Working Copy view contains the following actions 81 The Syncro SVN Client e New e New File This operation creates a new file and adds it to version control If the selected path is not under version control the newly created file will not be added to version control e New Folder This operation creates a new folder and adds it to version control If the selected path is not under version control the newly created directory will not be added to version control e New External Folder This operation sets a folder name in the property svn externals of the selected folder The repository URL to the folder to whi
111. ging to the same repository are updated to the exact same revision even if between those updates another commit occurred When the update fails with a message saying that there is already a local file with the same name Subversion tried to checkout a newly versioned file and found that an unversioned file with the same name already existed in your working folder Subversion will never overwrite an unversioned file unless you specifically do this with Override and update 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 Send your changes to the repository Sending the changes you made to your working copy is known as committing the changes If your working copy is up to date and there are no conflicts you are ready to commit your changes The Commit action sends the changes in your local working copy to the repository After selecting the action from the contextual menu you will see a dialog displaying the resources that can be committed 50 The Syncro SVN Client Figure 3 16 Commit dialog Commit Bug ID 1537 Commit message 1537 Changed version number Previous messages Choose a previously entered message v items userguide ant bat modified userguide htmlCustomLayer xsl modified userguide fimg caution gif unversioned userguide fimg important gif unversioned userquide img note gif un
112. h All trunk changes have been ported to the feature branch and now 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 These changes can be reintegrated into the trunk by this method It uses the merge tracking features of Subversion 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 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 63 The Syncro SVN Client Figure 3 22 Reintegrate a branch dialog E Merge Select the branch url From URL http decebal sync ro svn repos userquide branches 9 1 lv Target Working copy E current projects userguide The corresponding repository URL http decebal sync ro svnfreposfuserguide trunk Enter the full folder URL of the branch that you want to merge back 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 ite
113. h older revisions History actions available in the popup menu displayed by a right click in the view when a single resource is selected e Compare with working copy compares the selected revision with your working copy file It is enabled only when you select a file e Open opens the selected revision of the file into the Editor This is enabled only for files 55 The Syncro SVN Client Open With Displays the Open with dialog for specifying the editor in which the selected file revision will be opened This is enabled only for files Get Contents replace the current content of the local version of the selected file with the content of the selected revision Save revision to saves the selected revision to a file so you have an older version of that file This option is available only when you access the history of a file and it saves a version of that one file only Revert changes from this revision reverts changes which were made in the selected revision The changes are reverted in your working copy so this operation does not affect the repository file The action will undo the changes made only in selected revision It does not replace your working copy file with the entire file at the earlier revision This is useful for undoing an earlier change when other unrelated changes have been made since the date of the revision This option is enabled when the resource history was launched for a local working copy
114. hat contains the JRE please note that the package will automatically install a JRE prior to execution of the application but this JRE will be used on your computer only for running Syncro SVN Client it will be invisible to other applications Note The installation kits and the executable files packaged inside the installation kits were checked before publication with an antivirus program to make sure they are not infected with viruses trojan horses or other malicious software Procedure 2 1 Windows Installation Download the syncroSVNClient exe installation kit and run it Follow the instructions presented in the installation program The user preferences are stored in the subfolder com syncrosvnclient of the folder that is the value of the APPDATA Windows variable for the user that starts the application Note In order to specify another Java virtual machine to be used by Syncro SVN Client you have to set the home folder of the desired JVM in the Windows variable JAVA HOME or in the Windows variable JOK_ HOME If JAVA_ HOME and JDK_HOME are not set the application launcher will try to detect a JVM installed in a standard location on the Installation computer and use it for running the application If you installed the kit which includes a Java virtual machine you have to rename of remove the jre subfolder of the install folder in order for the variable JAVA_HOME or JOK_HOME to have an effect Procedure 2 2 Mac OS X Inst
115. he current version of the file in the working copy If the committed changes were in fact a SVN delete operation the result is restoring the deleted file in the working copy Make the selected revision the current revision in the work ing copy 31 The Syncro SVN Client Show History Display the history of the SVN resource of the selected revi sion Show Annotation Open the Annotations View for the selected revision Note On Mac and Linux systems the character can be used in the Folder field It will be expanded to the home folder path Use an existing working copy This is the process of taking an working copy that exists on your file system and connecting it to Subversion If you have a brand new project that you want to import into your repository then see the section Import resources into the repository This assumes that you have an existing valid working copy on your file system In the Working Copy View click on the Add Remove Working Copy toolbar button amp In the Working copies list dialog press the Add button and choose the working folder copy from the file system Select the new working copy from the list and press the OK button The selected working copy will be loaded and presented in the Working Copy View The Edit button allows changing the name of the working copy The name is useful to differentiate between working copies located in folders with the same name The default name is the name of the root
116. he selected resource s name You may specify other resource name if you want to make a branch tag using a different name than the one of the selected resource by modifying the field labeled Under the name The new branch tag will be created as child of the specified repository directory URL and having the new provided name To change the parent directory URL to the new path for your branch tag click on the Browse button and choose a repository target directory for your resource You can also specify the source of the copy There are three options e HEAD revision in the repository The new branch tag will be copied in the repository from the HEAD revision The branch will be created very quickly as the repository will make a cheap copy e Specific revision in the repository The new branch will be copied in the repository but you can specify exactly the desired revision This is useful for example if you forgot to make a branch tag when you released your application If you click on the History button on the right you can select the revision number from the History dialog This type of branch will also be created very quickly e Working copy The new branch will be a copy of your local working copy If you have updated some files to an older revision in your working copy or if you have made local changes that is 60 The Syncro SVN Client exactly what goes into the copy This involves transferring some data from your working cop
117. his parameter disables off screen pixmap support and must be added to the Java command line which starts the Java virtual machine at the end of the file svnClient5 1 located in the install directory 13 Chapter 3 The Syncro SVN Client Introduction What is Syncro SVN Client Syncro SVN is a client for the Subversion version control system compatible with Subversion 1 6 servers It manages files and directories that change over time and are stored in a central repository The version control 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 access older versions of your files and examine the history of how and when your data changed Quick start guide and reference The Main window section will provide a short description of the application main window layout general functions views and menus A Getting started chapter will take you through the basic operations such as e Define a repository location e Define a working copy e Manage working copy resources e Synchronize with a repository e Obtain information for a resource e Using the log history of a resource e Adding and changing the properties of a resource e Creating and maintaining branches and tags e Some more advanced repository operations The next few chapters refer to the views of the application e Repository view e Working copy view e Synchronize view 14
118. ide en hancements that rectify problems improve functionality and the general efficiency of the application This section explains the procedure for upgrading Syncro SVN Client while preserving any personal configuration settings and customizations Unless otherwise stated by instructions supplied with a patch or upgrade kit the following procedure is recommended Procedure 2 11 Upgrade Procedure 1 Create a new folder under syncrosvnClienteg syncrosvnClient 5 1 2 Download and extract the upgrade to the new folder 3 If you have defined Syncro SVN Client in the system PATH modify it to the new installation folder 4 Start Syncro SVN Client to ensure that the application can start and that your license is recog nized by the upgrade installation 5 If you are upgrading to a major version for example from 8 3 to 9 0 then you will need to enter the new license text into the registration dialog that is shown when the application is started 6 Select Help About to determine the version number If the previous version was 8 3 the About dialog should now show version 9 0 Checking for new versions Syncro SVN Client offers the option of checking for new versions at the http www syncrosvnCli ent com http www syncrosvnClient com site when the application is started If this option is enabled a message dialog will notify the user when new versions are released You can check for new versions manually at any time
119. iew th Check Out available only for directories checks out the selected revision of the directory When two nodes are selected in the revision graph of a file the right click menu of this selection contains only one item Compare for comparing the two revisions corresponding to the selected nodes If the resource for which the revision graph was built is a folder then the right click menu displayed for a two nodes selection also contains the item Compare but it computes the differences between the two selected revisions as a set of directory changes The result is displayed in the Directory Change Set view in the same way as for the compare action invoked from the History view on two revisions of a folder Warning Generating the revision graph of a resource with many revisions may be a slow operation You should enable caching for revision graph actions so that future actions on the same repos itory will not request the same data again from the SVN server which will finish faster Command line interface cross reference This section specifies the equivalent Subversion commands for each action in the Syncro SVN Client action 106 The Syncro SVN Client Actions commands reference Checkout svn checkout revision rev URL revision rev specifies the desired revision if necessary PATH URL is the repository URL you want to check out from PATH is the location on the file system Update svn update revision rev PA
120. igured More preferences that configure how the embedded SVN client tool works can be set in the global files called config and servers that is the files with parameters that act as defaults applied to all the SVN client tools that are used by the same user on his login account on the computer These files can be opened for editing with the two edit actions available in the SVN client tool on the Global Runtime Configur ation submenu of the Options menu Figure 5 8 The SVN preferences panel SVN Use unsafe copy operations J Use external SSH client D itempltestisshiplink exe 1 sorin i D templtestisshlsorin_ 7 Default SVN user Q Prompt for SVN user Results Console Maximum number of lines 100 y _ Show console when changed e Enable symbolic link support available only on Mac OS X and Linux Subversion has the ability to put a symbolic link under version control via the usual SVN add command The Sub version repository has no internal concept of a symbolic link it stores a versioned symbolic 125 Configuring the application link as an ordinary file with a svn special property attached The SVN client on Unix sees the property and translates the file into a symbolic link in the working copy Note Win32 has no symbolic links so a Win32 client won t do any such translation the object appears as a normal file If the symbolic link support is disabled
121. ii tds 81 Contextual men acontecido eee nee 81 Drag and drop operations iii d 86 ICONS nasua idol ii dsd 86 A A ean e E E A E A A E EE aeae 88 General desription ud e 88 SYNCNTONIZE ES ii 88 TOO DAL murino as 89 Contextual men aCtOns mii a 89 ICONS aia ad 91 Compare VIEW t 92 Descrip on ula ad 92 Toolbar uni a tds 93 Compare Images VIEW iseci nioi eine i 94 EOL iii ra 94 Description in 94 Image PLE VIEW anal 95 Description ia ao eae 95 Hi tor VIEW a il 95 DESCHPUON lr la idad it 95 History Ft sss cacesasuncierbavsscisy panacea cagessdsveteaduncaee ihe teneas ta casnasdenn coud mecese bebeaeeedeasaceesaaneaee 96 The History filter dial s ici 96 The History filter feld dias 97 ECALULTES vesical ja dais 97 Annotations VIEW ur ida 98 Description pili id idiota 98 Properties VIEW a ii 99 A adda saseasontea i sidecaca tuninacwileden as soaeadesdugedacs sn poaaneasedaatasusbeatangedeusmpoeaunes 99 The svn externals property raise 100 Syncro SVN Client 5 1 User Manual Toolbar Contextual menu ideo 101 Console VieW usina 101 Deseriptiot ssir aiee A A A EA AE EAR AET ENGS 101 Help Mi Wanna iia 102 Description seina ra suacelebaaecudwa dase A E AEE ATE S 102 The Revision Graph of a SVN Resource sssssssesssesssesessseesseesseesseesseeesstetssressressersseeeessees 102 Command line interface cross reference mendicidad 106 Actions commands reference seesseesseseseeesesesseetssresserssereseeessseesseesse
122. ing Copy view with a marker correspond ing to the depth value as follows e Recursive infinity This is the default value and it is has no mark e Immediate children immediates The directory is marked with a purple bubble in the top left corner e e File children only files The directory is marked with a blue bubble in the top left corner e This folder only empty The directory is marked with a gray bubble in the top left corner e The depth information is also presented in the Information view and the tool tip displayed when hovering over the directory in the Working copy view This feature requires the svn client to be 1 5 or above and will work most efficiently if the server is 1 5 or above The client will work also with a 1 4 server or lower but will be less efficient Repository View General description The repository view allows you to define and manage Subversion repository locations Repository files and folders are presented in a tree view with the repository locations at the first level where each location represents a connection to a specific Subversion Repository When hovering with the mouse over a repository resource a tooltip window will display more detailed information regarding URL last change revision last change author last change date Toolbar The toolbar for the repository view contains the following buttons D New Repository Location allows you to enter a new repository location by
123. ing these options on all the computers where an unattended installation is per formed you have to specify this file in the command line for example copy the file in the same location as the installer program and use the command on Windows syncroSVNClient ex q varfile response varfile on Linux syncroSVNClient sh q varfile response varfile Setting a parameter in the startup script On the Windows platform if you start the application by double clicking on the Start menu short cut Desktop shortcut in order to set a startup parameter you have to add a line with the parameter to the file syncroSVNClient vmoptions located in the installation directory together with the launcher file called syncroSVNClient exe Ifthe file syncroSVNClient vmoptions does not exist yet in the folder of the launcher file you have to create it there For example for setting the maximum amount of Java memory to 600 MB the content of the file syncroSVNC1li ent vmoptions must be Xmx0600m If you start the application with the script syncroSVNClient bat you have to add or modify the parameter to the java command at the end of the script For example for setting the maximum amount of Java memory to 600 MB the java command should start with java Xmx600m Dsun java2d noddraw true On the Mac OS X platform to add or modify a startup parameter you have to Ctrl click on the Syncro SVN Client application icon in Finder in the pop up menu selec
124. inst Working copy resource Path D projectsltest SYN Repository URL http devel sync ro synjrepos trunk Samples Revision to patch against CO HEAD revision 2 Other revision 372 In the next step the following options can be specified Figure 3 27 Patch between working copy and repository step 3 Create patch Select patch options and output location Patch options Patch depth Recursive infinity x C Ignore ancestry C Ignore line endings C Ignore Whitespaces Ignore whitespace change Ignore all whitespaces Output Save in clipboard Save in file D projects test SYN patch 70 The Syncro SVN Client Patch depth Ignore ancestry Ignore line endings Ignore whitespaces Save in clipboard Save in file The depth of recursive folders included in the patch If the patch is created only for a file then the depth is always zero The depth can have one of the values Current depth Recursive infinity Immediate children immediates File children only files This folder only empty The depth of going into the folder for creating the patch is the same as the depth of that folder in the working copy The patch is created on all the files and folders con tained in the selected folder The patch is created only on the child files and folders without going in subfolders The patch is created only on the child files The pat
125. ion Mark Resolved it is enabled on resources with real content conflicts displayed on the Working Copy view or in the Synchronize View Its function is to tell the Subversion system that you resolved the conflict and the resource can be committed See also Merge conflicts part Mark as Merged the action is enabled on pseudo conflicting resources from the Synchronize view It is used after you resolved the pseudo conflict by merging the changes and you want to commit the resource Read the Merge conflicts section for more information on methods to solve the pseudo conflicts Override and Update it is enabled on resources from the Synchronize view with outgoing changes including the conflicting ones It is used for dropping any outgoing change and repla cing the local resource with the HEAD revision See the Revert your changes section Override and Commit it is enabled on conflicting resources from the Synchronize View The action will drop any incoming changes and will send your local version of the resource to the repository See also Drop incoming modifications Compare operations from the Compare view i Perform Files Differencing used to perform file differencing on request e Go to First Modification used to navigate to the first difference 21 The Syncro SVN Client e Go to Previous Modification used to navigate to the previous difference Go to Next Modification used to navigate to
126. ion for the source view is distinguished from the tree view one by assigning it to a separate category Shortcut key The keyboard shortcut that launches the operation Double clicking on a table row or pressing the Edit button allows the user to register a new shortcut for the operation displayed on that row SVN File Editors Each type of file is associated with an editor which opens files of that type for editing The editor can be the built in one specially provided for the file type for example the internal XML editor the internal XSLT editor the internal XSL FO editor etc or an external application installed on the computer either the default system application associated with that file type in the operating system or other particular application specified by the path to its executable file The list of all the associations file type editor is displayed in the panel SVN File Editors The SVN File Editors preferences panel is opened from menu Options gt Preferences SVN File Editors 135 Configuring the application Figure 5 16 The SVN File Editors preferences panel SVN File Editors Extension Editor bat Internal editor Batch Editor Internal editor C Editor c Internal editor C Editor cc Internal editor C Editor cpp Internal editor C Editor css Internal editor CSS Editor Internal editor XML Editor ditaval Internal editor XML Editor dtd Inte
127. ions to scale the images at its original size or scale it down to fit in the view s available area The supported image types are GIF JPG JPEG PNG BMP Editor Description You can open a file for editing in e an internal built in editor e the default external application associated in the operating system with the type of the file e an external application installed in the operating system and specified by the path to its executable launcher There are default associations between frequently used file types and the internal editors but new associations can be added and the default associations can be modified with the action Open with available in the Repository view the Working Copy view and the History view which opens the following dialog The internal editor can be accessed either from the Working copy view or from the Synchronize view The editor can also be used from the History view to view a selected revision of a file In this case there are no edits allowed Only one file can be edited in an internal editor at a time If you try to open another file it will be opened in the same editor window The editor has syntax highlighting for known file types This means that a different color will be used for each type of recognized token in the file If the content type of the file is unknown you will be prompted to choose the proper way the file should be opened After editing the content of the file in an internal editor you can
128. is gt New Repository Location lt figure gt N lt figure gt title gt The Repository View contextual men e lt title gt The New Repository Location menu lt til lt screenshot gt lt screenshot gt lt mediaobject gt lt mediaobject gt lt imageobject gt lt imageobject gt lt imagedata align center fileref K y lt imagedata align center fileref ne lt limageobject gt lt limageobject gt lt mediaobject gt lt mediaobject gt lt screenshot gt lt screenshot gt lt figure gt lt figure gt lt para gt Before you can begin working with a 5 lt para gt The lt emphasis gt Add SVN Repository lt el a repository location in the lt link inkend re j URL of the repository you want to connect to View lt link gt lt para gt f is requested at the time the location is defined lt para gt To create a new repository location cM to request the user and password information Y A lt gt f lt A There are three types of differences e incoming changes changes committed by other users and not present yet in your working copy file They are marked with a blue highlight and on the middle divider the arrows point from right to left e outgoing changes changes you have done in the content of the working copy file They are marked with a gray highlight and the arrows on the divider are pointing from left to right e conflicting changes this is the case when the same section o
129. isplayed Request history for a resource In Subversion both files and directories are versioned and have a history If you want to examine the history for a selected resource and find out what happened at a certain revision what has been changed regarding that resource and who did the changes drop the modifications made in a certain revision check out update the resource to a selected revision compare two revisions of the same file and other actions you have to use the Show history action This is available from any of the three views Repository view menu Working copy view menu or Synchronize view menu From the Repository view you can display the log history regarding any remote resource residing in re pository From the Working copy view you can display the history of local versioned resources From the Synchronize view you can show the history of any incoming or outgoing resources The view itself consists of three distinct areas e The revision table showing revision numbers date time of revision name of the author as well as the first line of the commit message You can click on any revision to show its full details e The list of resources affected by this revision modified added deleted or changed properties e The commit message for the selected revision 54 The Syncro SVN Client Figure 3 17 History View History site xml Last changed revision 426
130. itted file due to a delay in getting write permis sion the result is that the committed file will be saved with zero length the content is removed and an error will be reported In this case this option should be selected so that SVN client does not try to make the safe copy SSH here you can specify the command line for an external SSH client which will be used when connecting toa SVN SSH repository Absolute paths are recommended for the SSH client executable and the file paths given as arguments if any Depending on the SSH client used and your SSH server configuration you may need to specify in the command line the username and or privatekey passphrase Here you can also choose if the default SVN user will be used the same as the SSH client user or you should be prompted for a user whenever SVN authentication is required For example on Windows the following command line uses the plink exe tool as external SSH client for connecting to the SVN repository with SVN SSH C plink install folder plink ex l usernam pw password ssh batch ho 126 Configuring the application e Results Console here you can specify the maximum number of lines displayed in the Console View and if the Console view should come to the foreground when there is some output that is displayed in this view e Annotations View here you can set the color used for highlighting in the editor panel all the changes contributed to a resource by the revision se
131. ize view action updates the selected resources to the revision against which the Synchronize operation was performed There are three different kinds of incoming changes e Non conflicting A non conflicting change occurs when a file has been changed remotely but has not been modified locally e Conflicting but auto mergeable An auto mergeable conflicting change occurs when a text file has been changed both remotely and locally i e has non committed local changes but the changes are on different lines 49 The Syncro SVN Client e Conflicting A conflicting change occurs when one or more of the same lines of a text file have been changed both remotely and locally Binary files are never auto mergeable and are conflicting by default If the resource contains only incoming changes or the outgoing changes do not intersect with in coming ones then the update will end normally the Subversion system merging incoming changes into the local file In the case of conflicting situation the update will have as result a file with conflict status The Syncro SVN Client allows you to update your working copy files to a specific revision not only the most recent one This can be done by using Update to revision action from the History view contextual menu If you select multiple files and folders and then you perform an Update all of those files folders are updated one by one The Subversion client makes sure that all files folders belon
132. king copy These files help Subversion recognize which files contain unpublished changes and which files are out of date with respect to others work A typical Subversion repository often holds the files or source code for several projects usually each project is a subdirectory in the repository s file system tree In this arrangement a user s working copy will usually correspond to a particular subtree of the repository Check out a working copy Check out is the term used to describe the process of making a copy of a project from a repository into your local file system This checked out copy is called a working copy A Subversion working copy is a specially formatted folder structure which contains additional svn folders that store Subversion information as well as a pristine copy of each item that is checked out You check out a working copy from the Repository View If you have not yet defined a connection to your repository you will need to add a new repository location To check out a new working copy navigate inside the repository to the desired directory right click on it and select Check Out from the popup menu In the Check out dialog click on the Browse button and choose the location where the working copy will be checked out 29 The Syncro SVN Client Figure 3 6 Check out dialog Check Out Repository URL http decebal sync ro svn repos Target Folder Browse Working copy Format
133. language To change the user interface language of lt oXygen gt you must set here the properties file with all the user interface messages and labels translated to your preferred language For details about creating this file see the section describing the creation process After setting the file you have to restart lt oXygen gt in order to change the user interface language to your preferred language 119 Configuring the application Look and Feel Styles Themes Use this option to change graphic style look and feel of the GUI On Windows there are available the following styles e Office 2003 e Vsnet e Eclipse e Xerto e Default Note After changing the style one has to restart the applica tion in order for the modification to take effect On Linux there are available the following styles e Eclipse e Default e GTK not recommended due to stability and paint issues 2 Note After changing the style one has to restart the applica tion in order for the modification to take effect On Mac OS X this option is not available On Windows this option is enabled only if the Office 2003 or Default styles In these cases the following themes are available e Normal Color e Home Stead e Metallic e Default e Gray 120 Configuring the application On Linux this option is not available On Mac OS X this option is not available Line separator This option defines line separator to be
134. lation Procedure 2 4 All Platforms Installation 1 Create a folder called syncroSVNClient on your local disk 2 Within the syncroSVNClient folder create child folder named in accordance with the application version number The directory structure looks as follows syncroSVNC1i ent pals 3 Download the All Platforms Installation package syncroSVNClient tar gz to this folder 4 Extract the archive to the same folder 5 Run from a command line the script syncroSVNClient bat on Windows syncroSVN ClientMac sh on Mac OS X syncroSVNClient sh on Unix Linux Note To change the version of the Java virtual machine that runs the application you have to specify the full path to the java executable of the desired JVM version in the Java com mand at the end of the script file for example C Program Files Java jrel 5 0_13 bin java Xmx256m Dsun java2d noddraw true on Windows System Library Frameworks JavaVM framework Versions 1 5 0 Home bin java Xdock name SyncroSVNClient on Mac OS X Procedure 2 5 Windows NT Terminal Server 1 Install the application on the server making its shortcuts available to all users 2 Edit the syncroSVNClient vmoptions file located in the install folder adding the parameter Dcom oxygenxml MultipleInstances true so that the file content looks like Xmx2 56m Dcom oxygenxml MultipleInstances true The Xmx value represents the maximum memory for
135. le comparison are considered outgoing changes and the ones obtained from the repository file comparison are considered incoming changes If any of the incoming changes overlap outgoing changes then they are in conflict 41 The Syncro SVN Client A special case of difference is a diff pseudo conflict This is the case when the left and the right sections are identical but the BASE revision does not contain the changes in that section By default this type of changes are ignored If you want to change this you can go to SVN Preferences and change the corresponding option The right editor of the internal compare view presents either the BASE revision or a revision from the repository of the file so its content cannot be modified By default when opening a synchronized file in the Compare View a compare is automatically performed After modifying and saving the content of the local file presented in the left editor another compare is performed You will also see the new refreshed status in the Working copy view Figure 3 13 Compare View http fdecebal sync ro svnfrepos userguide trunk usermanual xml E x Hi 227v g usermanual xml 506 usermanual xml 500 their work This is done via a Subversion repo A lt para gt To create a new repository location click lt sect3 id add edit remove repos locations gt Location lt emphasis gt toolbar button or righ lt title gt 4dd Edit Remove repository locatior select lt emphas
136. lected in the Annotations view e Revision Graph here you can enable caching for the action of computing a revision graph When a new revision graph is requested one of the caches from the previous actions may be used which will avoid running the whole query again on the SVN server which will finish the action much faster Working Copy The SVN Working Copy panel is opened from menu Options gt Preferences SVN Working copy and it contains the options that are specific for SVN working copy Figure 5 9 The Working copy panel SVN Working copy Working copy administrative directory svn When switching to an old format working copy _ Automatically upgrade _ Never upgrade O Always ask Automatically refresh the working copy J Show tooltip on Working Copy and Synchronize trees Enable working copy caching Clear cache 1 9 MB File name ignore patterns e Working copy administrative directory allows you to customize the directory name where the svn entries are kept for each directory in the working copy e When switching to an old format working copy you can instruct Syncro SVN Client to do one of the following e Automatically upgrade tells Syncro SVN Client that it must always upgrade every working copy that has an old format to the newest known format e Never upgrade tells Syncro SVN Client that it must never upgrade a working copy having an old format leaving it as it is 127
137. ll prompt you for the URL of the repository you want to connect to No authentication information is requested at the time the location is defined it is left to the Subversion client to request the user and password information when it is needed The main benefit of allowing Subversion to manage your password in this way is that it will prompt you for a new password only when your password changes Once you enter the repository URL Syncro SVN Client will try to contact the server and get the content of the repository for displaying it in the Repository view If the server does not respond in an the timeout interval set in Preferences an error will be reported If you don t want to wait until the timeout expires you can end the waiting process with the E Stop button from the toolbar of the view To edit a repository location click the Edit Repository Location toolbar button 4 or right click inside the view on a repository root entry and select Edit Repository Location from the popup menu The Edit SVN Repository dialog works in the same way as the Add SVN Repository dialog It will show the previously defined repositories URL and it will allow you to change them To remove a repository location click the Remove Repository Location toolbar button X or right click inside the view on a repository entry and select Remove Repository Location from the popup menu A confirmation dialog will appear in order to make sure you don t accidentally remove lo
138. low you to steal a lock if a certain condition is not satisfied The lock will stay in place until you commit the locked file or until someone unlocks it There is also the possibility that the lock will expire after a period of time specified in the Subversion server policy Unlocking a file A file can be unlocked from the context menu in the Working Copy View A dialog will prompt you to confirm the unlocking and it will also allow you to break the lock unlock it by force Synchronize with the repository In the work cycle you will need to incorporate other people s changes update and to make your own work available to others commit This is what the Synchronize View was designed for to help you send and receive modifications from the repository 37 The Syncro SVN Client Figure 3 9 Synchronize View Synchronize result SYN UserManual S 3 0 Act UserManual D gt announce test 5 0 css ol cals_table css D dist author 11 dist authorEclipse sD 14 dist oxygenEclipse 2 14 docbench lt ol gt docbench xml 2 ima S543 DeveloperGuide pdf lt a DeveloperGuide xml lt userguide windows css KA userguide xpr lt o usermanual xml In the Synchronize view you can see the overall status of your working copy resources when com pared to the repository resources The view focuses on incoming and outgoing changes where in coming changes are the changes that other users have committed since y
139. lp view 102 History view description 95 history actions 97 history filter dialog 96 history filter field 97 image preview 95 main window 15 main menu 17 starting Syncro SVN Client 16 views 16 obtain information for a resource request history 54 request status information 53 Properties view description 99 toolbar and contextual menu 101 Repository view contextual menu actions 77 general description 76 Toolbar 76 Resource History view 55 Directory Change Set view 57 history actions available on double selec tion 56 history actions available on single selection 55 Revision Graph 102 sparse checkouts 75 SVN Branches Tags 59 SVN properties 58 Add Edit Remove 58 SVN working copy resources 32 Synchronize view contextual menu actions 89 general description 88 icons 91 synchronize trees 88 Toolbar 89 Synchronize with the SVN repository 37 Working Copy view contextual menu actions 81 general description 79 icons 86 Toolbar 81 working with repositories Copy Move Delete resources 75 import export resources 74 SVN working copy resources add resources to version control 33 Copy Move Rename resources 34 delete resources 34 edit files 32 ignore resources 33 lock unlock resources 35 locked items 36 locking a file 37 scanning for locks 36 unlocking a file 37 Synchronize with the SVN repository 37 commit changes 50 integration with Bug Tracking tools
140. lter field by the operation s description category or shortcut key The Menu Shortcut Keys preferences panel is opened from menu Options gt Preferences Menu Shortcut Keys 134 Configuring the application Figure 5 15 The Menu Shortcut Keys preferences panel Menu Shortcut Keys synchronize x Description Category 4 Shortcut key Synchronize Working copy ctrl shift 5 Add Synchronize ctrl alt shift D Add to svn ignore ISynchronize ctrl alt shift 1 Collapse All Synchronize ctrl alt Z Commit Synchronize ctrl alt M Commit All Synchronize Create path _Bynchronize _ E Edit conflict ISynchronize ctrl alt shift E Expand All Synchronize letrlalex File Information Synchronize ctrl alt 1 Mark Resolved Synchronize ctrl alt shift 5 Mark as Merged Synchronize ctrl shift M Open Synchronize ctrl alt O Open in Compare Editor Synchronize ctrl alt C Open with Synchronize Override and Commit Synchronize Override and Update Synchronize ctrl shift U Refresh Synchronize ctrl alt R Revert Synchronize ctrl alt Y Show History Synchronize ctrl alt H Show SYN Properties Synchronize ctrl alt shift P Synchronize Synchronize ctrl alt S Update Synchronize ctrl alt U Description A short description of the menu item operation Category The shortcuts are classified in categories for easier management For example the Cut operat
141. ma separated specific revisions or a range of revisions separated by a dash or any combination of these You can click on History button to select in the easiest way the list of revisions to be merged One or several revisions can be selected then by clicking on OK the list of revision numbers to merge will be filled in the Revision range text field If you want to merge changes back out of your working copy to revert a change which has already been committed select the revisions to revert and check the Reverse merge box 62 The Syncro SVN Client If you have already merged some changes from this branch and you remember the last merged re vision you can use History for the Working Copy to trace that revision For example if you have merged revisions 27 to 33 last time then the start point for this merge operation should be revision 33 Subversion has merge tracking features and automatically records the last merged revision so you do not need to remember when you performed the last merge 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 The target panel of the dialog reminds you the location of the target resource from the working copy where the merge result will be saved and its corresponding repository URL Click Next and go to Merge Options Reintegrate a branch This method covers the case when you have made a feature branc
142. ments 2 unattended Windows and Linux only 6 Windows 3 L License register a license key 9 registration code 10 P Performance problems large documents 12 problems on Linux Solaris 13 S Startup parameter 7 SVN Branches Tags 59 create a Branch Tag 59 create patches 68 from repository revision 72 from working copy 69 merging 61 merge options 65 merge revisions 62 merge two different trees 64 reintegrate a branch 63 resolve merge conflicts 66 relocate a working copy 68 switch the repository location 67 SVN Client 14 Annotations view 98 command line interface 106 add 109 add edit property 112 add to svn ignore 109 branch tag 111 checkout 107 cleanup 110 commit 107 copy 109 delete 109 diff 107 export 108 import 108 information 109 lock 112 mark as merged 112 mark resolved 110 142 Index merge 111 move rename 110 override and commit 112 override and update 112 refresh 108 remove property 113 revert 110 revert changes from these revisions 113 revert changes from this revision 113 scan for locks 111 show refresh properties 110 show history 108 synchronize 108 update 107 Compare view Compare images view 94 description 92 Toolbar 93 Console view 101 define a repository location 26 Add Edit Remove repository locations 26 authentication 27 define a working copy 28 check out 29 use an existing working copy 32 editor 94 He
143. ms 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 The target panel of the dialog reminds you the location of the target resource from the working copy where the merge result will be saved and its corresponding repository URL Merge two different trees This is a general case of the reintegrate method You can consider the following example 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 The result is that trunk will be identical with the branch If the server does not support merge tracking then this is the only way to merge a branch back to trunk 64 The Syncro SVN Client Figure 3 23 Merge trees dialog E Merge Select the urls to be merged From http fdecebal sync ro svnjrepos userguide tags 7 2 HEAD Revision Revision To http decebal sync ro svnjrepos userquidejtrunk v HEAD Revision Revision 5185 Target Working copy E current projects userquide The corresponding repository URL http decebal sync ro svnfreposfuserguide trumk By default the start URL will be the URL of the selected file in the working copy You can browse the rep
144. n the document is opened The available options are e REPORT Show an error dialog with the character that cannot be represented in the specified encoding and allow the user to decide how to continue ignore that character replace it with a standard replacement character This is the default option e IGNORE The character is ignored and it will not be in cluded in the document displayed in the editor panel e REPLACE Replace the character with a standard replace ment character For example if the encoding is UTF 8 the 122 Configuring the application Editor replacement character has the Unicode code FFFD and if the encoding is ASCII the character code is 63 The Editor preferences panel is opened from menu Options Preferences Editor Use these options to configure the visual aspect of the text editor Figure 5 6 The Editor preferences panel Editor Selection background color Selection foreground color Editor background color Editor caret color Line number foreground 4 Show line numbers in editors Show TAB NBSP EOL EOF marks Cut Copy whole line when nothing is selected Selection background color Selection foreground color Editor background color Editor caret color Line number foreground Indent Indent with tabs Tab size 4 y Undo Undo history size 200 To apply this change you must restart the application Use this
145. ncoming modifications ssseseseeeesseesseesseesseeesseetsseesseesseesseressseesseeso 48 Tree COMICS ssajtasims apli 48 Update the working Copy as 49 Send your changes to the repository ccoocccconcccnoncnononcnonnncnonancnononocnn cocoa nc conan nacion 50 Integration with Bug Tracking Tools cceesscessseceececeeeeeceeeeeceeeeecseeeeesneeeenaes 52 Obtain information for a resource eseesseseseesessessrseresseseresressetstesreesetstesressetseseeesreseee 53 Request status information for a resource cooooccccoocccooncncnoncnononaconanaconnncnnnnnccnnnncnnns 53 Request history for a resource essseeesseesssesseesseresseeessressesseesseressseesseesseesseeeseee 54 Using the resource history View seisisccczesassastevaseseedenss soaclysasenesaspacndecdeaaouessnccedesessaunedveeds 55 History actions available in the popup menu displayed by a right click in the view when a single resource is selected scccs secccdscssssecessncetes secveceeavenstecssdeecvaneeze 55 History actions available on the popup menu for double selection 56 Directory Change Set View cocina idad ade 57 Management of SVN properties sicsic c siccssvassas arica lecitina dais 58 Add Edit Remove SVN properties ooooocccnoncccnonncononanononacononanononanoonnnnnonaccnonacono 58 Creation and management of Branches TagS oooococnnncccnoncccnonnnononcnonancnnnnnccnonnccnnanoconnos 59 Create a Branch s Tag ae 59 METIO tadas did 61 Merge
146. nd the Off option disables it Starting with version 1 6 the combo contains also values specific for sub pixel antialiasing like GASP 121 Configuring the application LCD_HRGB LCD_VRGB which sets the respective antialiasing mode for the text displayed in the Syncro SVN Client editors and views Text components Use this option to select the font family and size used to display text in text components After changing the font one has to restart the ap plication GUI Use this option to select the font family and size used to display GUI labels After changing the font one has to restart the application Encoding The Encoding preferences panel is opened from menu Options Preferences Encoding Figure 5 5 The Encoding preferences panel Encoding Encoding for non XML files Cp1252 v Encoding errors handling REPORT L lt Encoding for non XML files This option defines the default encoding to be used when opening non XML documents This is necessary because non XML files have a large variety of formats and there is no standard mechanism for declaring the encoding that should be used for opening and saving the file In case of XML files the encoding is usually declared at the beginning of the file in a special declaration or it assumes the default value UTF 8 Encoding errors handling This option defines how to handle characters that cannot be represented in the specified encoding of the document whe
147. nditions are checked and you cannot connect to the SVN repository please generate a logging file on your computer and send the logging file to lt support syncrosvnclient com gt For generating a logging file you need to create a text file called log4j properties in the install directory with the following content log4j rootCategory debug R2 log4j appender R2 org apache log4j RollingFileAppender log4j appender R2 File logging log log4j appender R2 MaxFileSize 12000KB log4j appender R2 MaxBackupIndex 20 log4j appender R2 layout org apache log4j PatternLayout log43 appender R2 layout ConversionPattern r Sp St Sc Restart the application reproduce the error close the application and send the file 1og ging log generated in the install directory to lt support syncrosvnclient com gt 141 msn Index C Common problems 141 Configure the application 118 Archive 132 Diff 129 Diff Appearance 132 Editor preferences 123 open save 124 encoding 122 fonts 121 global 119 import export global options 118 menu shortcut keys 134 messages 139 140 reset global options 140 SVN 125 SVN Diff 128 SVN file editors 135 Working Copy 127 E edit copy paste 114 find replace 114 find replace keyboard shortcuts 117 F find replace 114 keyboard shortcuts 117 Installation All Platforms version 5 Linux 4 Mac OS X 4 multiple instances Unix Linux server 6 require
148. nt and the Subversion repository The output is expressed as subcommands to the Subversion server and simulates the Subversion command line notation For a detailed description of the Subversion console output read the SVN User Manual In the right toolbar there are available a Clear action which clears the content of the view and a Lock Unlock scroll action which disables the automatic console scrolling 101 The Syncro SVN Client The maximum number of lines displayed in the console the length of the buffer can be modified from Preferences By default this is set to 100 Help View Description The Help view is a dynamic help window It changes its content displaying the help section referring to the currently selected view As you change the focused view you will be able to read a short description of it and its functionality The Revision Graph of a SVN Resource The history of a SVN resource can be watched on a graphical representation of all the revisions of that resource together with the tags in which the resource was included The graphical representation is identical to a tree structure and is easy to view The graphical representation of a resource history is invoked with the action Revision graph available on the right click menu of a SVN resource in the Working Copy view and the Repository view Figure 3 38 The Revision Graph of a File Resource Mi Revision Graph userguide trunk usermanual xml BAX
149. nt has both incoming and outgoing changes but the changes can be merged by the update operation A folder can be in mergeable conflict when it contains files in mergeable conflict and or real conflict themselves After an update it is possible that the state of conflict can be resolved automatically by merging the incoming changes into the working copy resource A conflicting resource cannot be committed In the conflict case the resource will be marked with a conflict icon and will appear in all the Syn chronization trees Content conflicts vs Property conflicts On the other hand depending on the situation the conflicts are separated in two categories Content conflicts and Properties conflicts Content conflicts this type refers to the fact that the conflict appears in the content of a file A merge occurs for every inbound change to a file which is also 43 The Syncro SVN Client modified in the working copy In some cases if the local change and the incoming change intersect each other Subversion cannot merge these changes without intervention So if the conflict is real when updating the file in question the conflicting area is marked like this lt lt lt lt lt lt lt filename your changes code merged from repository gt gt gt gt gt gt gt revision Also for every conflicted file Subversion places three additional temporary files in your directory e filename ext mine This is your file as it existed in you
150. ntacts the repository and determines the changes made by you to the working copy and by others to the repository The synchronize result will be displayed in the Synchronize view The actions performs a synchronize operation on the root of the working copy Refresh refreshes the content of the working copy The content of the working copy is always scanned refreshed when starting the Subversion client or when changing the working copy from the combo box in the toolbar However if you make modifications from other applications outside the Subversion client while the client is started you will have to manually refresh the working copy The action performs a refresh operation on the root of the working copy A Cleanup performs a maintenance cleanup operation on the working copy Sometimes when an operation fails the working copy will enter an inconsistent state in which some resources will remain locked by SVN Cleanup removes those maintenance locks and allows you to continue your work When the SVN client determines that an operation failed because the working copy is locked by SVN you will be asked if a Cleanup operation should be performed first Combo box The combo box list contains all the working copies the Subversion client is aware of When you select another working copy from the combo the newly selected working copy content will be scanned and displayed in the view 4 Add Remove Working Copy opens the Working copies list dialo
151. o conflict occurs when two developers make the same change for example when both add or remove the same line of code e Compare With External Application you can specify an external application to be launched for compare operations in the following cases when two history revisions are compared when the working copy file is compared with a history revision or when a conflict is edited The parameters firstFile and secondFile specify the positions of the two compared files in the command line for the external diff application e Maximum number of differences you can change the maximum number of differences allowed in the view 128 Configuring the application Diff from lt oXygen gt XML Diff Syncro SVN Client offers both directory and file comparison six different diff algorithms to choose from for file comparison and multiple levels of comparison The complete diff solution includes two XML diff algorithms XML Fast and XML Accurate one Syntax Aware algorithm that gives very good results on all file types known by Syncro SVN Client and three all purpose algorithms line based word based and character based Any algorithm can be used to perform differences on request but Syncro SVN Client offers also an automatic selection of the algorithm selecting the most appropriate one based on the files content and size The Diff preferences panel is opened from menu Options Preferences Diff Figure 5 11 The Diff pref
152. of the resource to be committed recursive specifies that the property should be set recursively PROPNAME the property name PROPVALUE the property value PATH the resource path 112 The Syncro SVN Client Remove property svn propdel recursive PROP recursive specifies that the property should be de NAME PATH leted recursively PROPNAME the property name PATH the resource path Revert changes from this revision svn merge rev rev 1 URL rev revision whose changes must be reverted URL The SVN URL corresponding to the resource Revert changes from these revisions svn merge revl rev2 URL rev first revision number rev2 second revision number URL The SVN URL corresponding to the resource 113 Chapter 4 Text editor specific actions Syncro SVN Client provides user actions common in any text editor Undoing and redoing user actions Edit gt Undo Ctrl Z or the toolbar button 1 Undo to reverse a maximum of 100 editing actions to return to the preceding state Complex operations like Replace All Indent selection etc are treated as a single undo event Edit gt Redo Ctrl Y for Windows Ctrl Shift Z for Mac OSX and Linux to recreate a maximum of 100 editing actions that were undone by the Undo function Copying and pasting text Edit Cut Ctrl X to remove the current selected node from the document and places it in the clipboard Edit gt
153. on runs in the editor panel and in any non editable text area for example the Console view Repository operations from the Repository view 0 New Repository Location allows you to enter a new repository location by means of the Add SVN Repository dialog Figure 3 2 Add SVN Repository Add SVN Repository Repository URL http svn public repository con svwrepos Y Validate repository connection OK If the checkbox Validate repository connection is not selected the URL is added in Repository view without validation of connection amp Edit Repository Location context dependent allows you to edit the selected repository location by means of the Edit SVN Repository dialog It is active only when a repository location root is selected Change the Revision to Browse context dependent allows you to change the selected re pository revision by means of the Change the Revision to Browse dialog It is active only when a repository location root is selected X Remove Repository Location allows you to remove the selected repository location from the view It shows you a confirmation dialog before removal Itis active only when a repository location root is selected th Check Out allows you to copy resources from a repository into your local file system To use this operation you must select a repository root location or a folder from a repository but never a file If you don t select anything you
154. one v In the first table in the dialog you will be able to see the resources that will be overridden You can also select or deselect them as you wish In the second table you will find the list of resources that will be updated Only resources that have an incoming status in the Synchronize view will be updated Merge conflicted resources Before you can safely commit your changes to the repository you must first resolve all conflicts In the case of pseudo conflicts they can be resolved in most cases with an Update operation which will merge the incoming modifications into your working copy resource In the case of real conflicts conflicts that persist after an update operation it is necessary to resolve the conflict using the built in compare view and editor or in the case of properties conflict the Properties view Before you can commit you must mark as resolved the affected files Both pseudo and real conflicts can be resolved without an update You can e open the file in the compare editor e analyze the changes e edit the changes 47 The Syncro SVN Client e decide which incoming changes need to be copied locally e decide which outgoing changes must be overridden or modified After saving your local file you have to use the Mark as merged action from the contextual menu before committing Drop incoming modifications In the situation when your file is in conflict but you decide that your working copy fil
155. operations The action actually modifies the value of the svn ignore property of the re source s parent directory Lock e Scan for locks This action contacts the repository and recursively obtains the list of locks for the selected resources A dialog containing the locked files and the lock description will be displayed Only active for resources under version control For more details see the section Scanning for locks Lock It allows you to lock certain files for which you need exclusive access You can write a comment describing the reason for the lock and you can also force steal the lock The action is active only on files under version control For more details on the use of this action please read the section Locking a file e amp Unlock This action releases unlocks the exclusive access to a file from the repository You can also choose to unlock it by force break the lock Show SVN Properties brings up the Properties view and displays the SVN properties for the selected resource 85 The Syncro SVN Client File Information provides additional information for the selected resource from the working copy For more details please see the section Obtain information for a resource Drag and drop operations New files and folders can be added to the file tree of the Working Copy view as unversioned re sources by drag and drop operations from other applications for example Windows Expl
156. orer on Windows or Finder on Mac OS X Also the structure of the files tree can be changed with drag and drop operations inside the view Icons The icons in the working copy view have a small overlaid icon which describes the current state of the resource in the working copy These state icons are g Unversioned The resource marked with this symbol is not under version control This is how new files are represented when they are created or copied from the file system Unversioned re sources can be filtered from the Working Copy view by setting ignore filters in the Preferences a Added This resource has been added to version control but has not been committed This state is obtained after issuing an Add command on an unversioned resource a Added with history This resource has been copied with history This state is obtained by copying moving or renaming a resource from the working copy Modified The resource has been locally modified since the last update This is obtained after editing a file and making changes t Deleted This resource has been deleted from the working copy This state appears after de leting moving or renaming files with Subversion a Missing Incomplete This resource is in an inconsistent state If it s missing it means it has been deleted from the file system without Subversion s knowledge If it s incomplete a check out or update action has probably failed or has been interrupted befo
157. ository and select a start URL and then choose a revision 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 In the From field enter the full folder URL of the trunk This may sound wrong but remember that the trunk is the start point to which you want to add the branch changes In the To field enter the full folder URL of the feature branch In both the From Revision field and the To Revision 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 The target panel of the dialog reminds you the location of the target resource from the working copy where the merge result will be saved and its corresponding repository URL Merge Options This page lets you specify advanced options before starting the merge process You can specify how far down into your working copy the merge should go by setting the merge depth The depth term is described in the Sparse checkouts section The default depth is Working copy which uses the existing depth setting 65 The Syncro SVN Client The Ignore ancestry checkbox allows a merge to be applied between a branch and the trunk or between two
158. ou have to specify by the path of its executable file Also you can specify some arguments for that application if they are needed This option also works for directories if you wish to choose a file browser other than the system default e Internal editor this options allows you to select an editor type from the built in editors that Syncro SVN Client comes with By default this option is disabled when selecting directories Note a For opening a directory you can choose one of the first two options The System default ap plication will be used to open that directory in the system built in file browser i e Windows Explorer for Windows Finder for Max OS X etc and the second one for opening that directory using a file browser other than the system default If a file type is associated with an internal editor other than the XML Editor then the encoding set in the preference Encoding for non XML files is used for opening and saving a file of that type This is necessary because in case of XML files the encoding is usually declared at the beginning of the XML file in a special declaration or it assumes the default value UTF 8 but in case of non XML files there is no standard mechanism for declaring the encoding of the file 137 Configuring the application HTTP Proxy Configuration Some networks use Proxy servers to provide Internet Services to LAN Clients Clients behind the Proxy may therefore only connect to the Intern
159. ou last updated your working copy The outgoing changes are the modifications you made to your working copy as a result of editing removing or adding resources The view presents the status of the working copy resources against the BASE revision after a Refresh operation You can view the state of the resources versus a repository HEAD revision by using the Synchronize actions from the Working Copy view Presentation modes The Synchronize view has three presentation modes Tree mode The resources are presented in a tree layout as in the above image which mirrors the tree structure of the SVN repository and of the Working Copy view This mode is more appropriate when you want a quick overview of the locations which need synchronization with the SVN repository or when you want to apply a synchronization operation Commit Update Revert Add recursively on a folder 38 The Syncro SVN Client Compressed mode Figure 3 10 Synchronize View Tree mode Synchronize result x SVN UserManual S x O Oct 4 e 2 UserManual had 2 announce test 0 css gotb cals_table css 5 0 dist author 5 0 site 1 articles ug author ug authorEclipse ug oxygen a ug oxygenEclipse FE Author UserManual pdf 44 AuthorEclipse UserManual pdf il Oxygen UserManual pdf mta OxygenEclipse UserManual pdf 0 dist authorEclipse H dist oxygen 0 dist oxygenEclipse 5 14 docbench lt ol gt docbench xml 2 im
160. p Keep incoming ic workspace 2 query sql Keep incoming la workspace 2 webpage html Keep incoming Kel workspace 2 users xquery Resolve later sa workspace 2 schema xsd Keep incoming za Workspace 2Z text txt Keep incoming ia workspace 2jindex html Resolve later Keep incoming Keep outgoing Mark resolved Keep all incoming Keep all outgoing Edit conflict Cancel resolving The options to resolve a conflict are e Resolve later used to leave the conflict as it is for manual resolving it later e Keep incoming this option keeps all the incoming modifications discarding all current ones from your working copy e Keep outgoing this option keeps all current modifications from your working copy discarding all incoming ones e Mark resolved you should chose this option after you have manually edited the conflict To do that use the Edit conflict button which will bring to you a dialog presenting the conflicting re source s content for current working copy version and the one with the incoming modifications After manually resolving the conflict the resource will be marked as resolved Switch the Repository Location The Switch action is useful when the repository location of a working copy or only of a versioned item of the working copy must be changed within the same repository It is available on the Tools menu for a selected working copy versioned resource except an external folder
161. pear as modified in a synchronization operation that is newer than the BASE version even if the contents is from an older version from history 97 The Syncro SVN Client e Save revision to saves the selected revision to a file so you have an older version of that file This option is only available when you access the history of a file and it saves a version of that one file only e Revert changes from this revision reverts changes made in the selected revision e Update to revision updates your working copy resource to the selected revision e Check out from revision gets the content of the selected revision for the resource into local file system i Show Annotation computes the latest revision number and author name that modified each line of the file up to the selected revision that is no modification later than the selected revision 1s taken into account e Change Author changes the name of the SVN user that committed the selected revision e Change Message changes the commit message of the selected revision Double selection actions e Compare revisions When the resource is a file the action compares the two selected revisions using the Compare view When the resource is a folder the action displays the set of all resources from that folder that were changed between the two revision numbers e Revert changes from these revisions Similar to the svn merge command it merges two selected revisions into th
162. pecific preference that is available in any Preferences panel or what effect it will have you can open a help page about the current panel at any time using the help button located in the left bottom corner of the dialog Figure 5 2 The Help button of the Preferences dialog Custom Validation CSS Validator XML 4 i gt Global Options Project 118 Configuring the application Global The Global preferences panel is opened from menu Options Preferences Global Figure 5 3 The Global preferences panel Global C Automatic Version Checking Language English v C Other language Look and Feel windows o v Styles Office 2003 v Themes Default Line separator System default Detect the line separator on file open Show Java vendor warning at startup File chooser dialog C Show hidden files and directories Automatic Version Checking When enabled checks the availability of new Syncro SVN Client versions at http www syncrosvnClient com http www syncrosvnClient com Language The application supports a number of languages for localiz ation of the GUI Select Options Preferences Glob al Language drop list to display the language choices Note After restarting the application if some GUI labels are not rendered correctly you will need to install the cor responding language pack from your OS installation kit Other
163. peration which modifies the archive is per formed the archive contents will be duplicated The duplic ate file name will be origin alArchiveFile Name bak and will be saved in the same directory Before each operation which modifies the archive is per formed the archive contents will be duplicated The duplic ate file names will be ori ginalArchiveFile Name bak dupNo and the files will be saved in the same directory 133 Configuring the application Archive types table This table contains all known archive extensions mapped to known archive formats You can edit the table to modify existing mappings or add your own extensions to the list of known archive extensions Figure 5 14 Edit the Archive extension mappings w Archive Extensions Hocx pptx xlsx dotx docm dotm pptm potx pi Type zip x Example odf odg zip Description Office Open XML OOXML You can map a list of extensions to an archive type supported in lt oXygen gt M Important You have to restart lt oXygen gt after removing an ex tension from the table in order for that extension to not be recognised anymore as an archive extension Menu Shortcut Keys The user can configure in one place the keyboard shortcuts available for menu items available in Syncro SVN Client The current shortcuts assigned to menu items are displayed in the following table The user can search an operation using the fi
164. py view A Cleanup performs a maintenance cleanup operation to the selected resources from the working copy This operation removes the Subversion maintenance locks that were left behind Useful when you already know where the problem originated and want to fix it as quickly as possible Only active for resources under version control Update This command updates your selected resources from the working copy to the HEAD revision from the repository latest modifications It the same as the update action from the Synchronize view in that also brings you the HEAD revision from the repository If a directory is involved it will be updated depending on its depth The action is active only on resources that are under version control Update to revision depth This action allows you to update the selected resources from the working copy to an earlier revision from the repository You can also select the update depth for the current folder You can find out more about the depth term in the sparse checkouts section The action is active only on resources under version control Commit This action collects the outgoing changes from the selected resources in the working copy and presents them in a dialog Then you can choose exactly what to commit by selecting or unselecting resources accordingly A directory will always be committed recursively The unversioned resources will be deselected by default In the commit dialog you will also have to enter a
165. r working copy before you updated your working copy that is without conflict markers This file has your latest changes in it and nothing else e filename ext rOLDREV This is the file that was the BASE revision before you updated your working copy That is the file revision that you updated before you made your latest edits e filename ext rNEWREV This is the file that Subversion client just received from the server when you updated your working copy This file corresponds to the HEAD revision of the repository OLDREV and NEWREV are revision numbers If you have conflicts with binary files Subversion does not attempt to merge the files by itself The local file remains unchanged exactly as you last changed it and you will get filename ext r files also Properties conflicts refer to the conflicts that are obtained when two people modify the same property of the same file or folder When up dating such a resource a file named filename ext prej is created in your working copy containing the nature of the conflict Your local file property that is in conflict will not be changed After resolving the conflict one should use the Mark resolved action in order to be able to commit the file Note that the Mark resolved action does not really resolve the conflict It just removes the conflicted flag of the file and deletes the temporary files Edit real content conflicts The conflicts of a file in the conflicted state a file with the red
166. rces You cannot copy resources that are added but not yet committed 34 The Syncro SVN Client In the Copy File s dialog you can navigate through the working copy directories in order to choose a target directory If you try to copy a single resource you are also able to change that resource s name in the corresponding text field If an entire directory is copied the Override and update action will be enabled only for it and not for its descendants In the Synchronize view and the Commit dialog will appear only the directory in question without its children Move resources As in the case of the copy command you can perform the operation on several resources at once Just select the resources in the Working Copy View and choose the Move command from the context menu The move command actually behaves as if a copy followed by a delete command were issued You will find the moved resources at the desired destination and also at their original location but marked as deleted Rename a resource The rename action can be found in the context menu in the Working Copy View This action can only be performed on a single resource The rename command acts as a move command with the destination being the same as the original location of the resource A copy of the original resource will be made with the new name and the original will be marked as deleted Note Because the rename and move commands act as a copy followed by delete when you
167. re finishing A directory in such a state must be restored with an update action before any other action can be performed a Conflict This resource has conflicting changes A resource can be in this state after an update if it was modified both locally and on the repository and the modifications were overlapping a Tree Conflict This resource has a tree conflict A resource can be in this state after an update or merge the local file is modified but the remote file was removed so the local modifications cannot be committed the file does not exist on the repository any longer and a remote version cannot override the local modifications 86 The Syncro SVN Client a Obstructed This resource is obstructed which means that there was found an unexpected unversioned resource instead of the expected versioned one The main icon indicates the type of the resource that is obstructing the original resource There are three possibilities to have an ob structed resource e A directory can be considered to obstruct another directory if the SVN administrative directory svn was deleted from the latter one so an unexpected unversioned directory is found instead of the original versioned directory e A directory can be considered to obstruct a file if the file was deleted and there was created a directory having exactly the same name as the file so an unexpected unversioned directory is found instead of the original versioned file
168. rking copy from the selected directory in the repository Import Import Folder Content imports the content of a specified folder from the file system into the selected folder from the repository e Import File s imports the files selected from the files system into the selected folder from the repository Export exports a directory from the repository to the local file system New Folder allows you to create a new folder in the selected repository path Copy URL Location copies the encoded URL for the selected resource from the repository to the clipboard Show History brings up the History view and displays the log history for the selected re source from the repository 77 The Syncro SVN Client il Show Annotation brings up a dialog for selecting the start revision and the end revision of the interval of revisions for which the SVN annotations will be computed and marked in the selected resource in the editor panel After selecting the start revision and the end revision and pressing OK the Annotations view and the History view are displayed and the annotations are marked on the SVN resource in the editor panel Revision Graph brings up the Properties view and displays the SVN properties for the selected repository resource This view does not allow adding editing or removing SVN properties of a repository item These operations are allowed only for working copy resources
169. rnal editor DTD Editor Internal editor DTD Editor Internal editor FO Editor Internal editor HTML Editor Internal editor HTML Editor Internal editor Java Editor Internal editor XML Editor Internal editor JavaScript Editor Internal editor XML Editor Internal editor XML Editor Internal editor XML Editor Internal editor DTD Editor Internal editor NRL Editor The Edit button under the table or a double click on a table row opens a dialog for specifying the editor associated with the file type The same dialog is displayed and after an Open with action on a selected file from Syncro SVN Client 136 Configuring the application Figure 5 17 The Open With dialog for file type editor associations y Open with Select an application For opening files with extension xml System default application System application C Program Files Oxygen XML Editor oxygen exe Arguments XML Editor MN XSL Editor FO Editor WSDL Editor XQUERY Editor XSD Editor NRL Editor NYDL Editor RNC Editor RNG Editor x In this dialog are offered three options for opening a file e System default application this option allows you to open the selected file using the application that is associated with that file extension by default in your operating system e System application opens the selected file using an external application that y
170. roperties being committed to the repository before will be completely deleted or reverted to BASE revision and after that updated to HEAD revision to avoid obtaining conflicts when updating Show History It will display the History view where the log history for the selected resource will be presented For more details about resource history see the sections Using the resource history view and Request history for a resource la Show Annotation It will display the Annotations view where all the users that modified the selected resource will be presented together with the specific lines and revision numbers modified by each user For more details about resource annotations see the section Annotations View s Revision Graph This action allows you to see the graphical representation of a resource s history For more details about a resource s revision graph see the section Revision Graph Add This operation adds the selected resources to version control A directory will be added recursively to version control It is not mandatory to explicitly add resources to version control but 1t is recommended At commit time unversioned resources will have to be manually selected in the commit dialog It is only active on unversioned resources Add to svn ignore This action can only be performed on resources not under version control It allows you to keep inside your working copy files that should not participate to the version control
171. rted into inter repository file externals are not supported e While commits do not descend into a directory external a commit in a directory containing a file external will commit any modifications to the file external The differences between a normal versioned file and a file external e File externals cannot be moved or deleted the svn externals property must be modified instead however file externals can be copied A file external shows up as a X in the switched status column Warning Incomplete support In subversion 1 6 it is not possible to remove a file external from your working copy once you have added it even 1f you delete the svn externals property altogether You have to checkout a fresh working copy to remove the file Toolbar Contextual menu The properties view toolbar and contextual menu contain the following actions Add a new property This button invokes the Add property dialog in which you can specify the property name and value A Edit property This button invokes the Edit property dialog in which you can change the property value and also see its original base value e X Remove property This button will prompt a dialog to confirm the property deletion You can also specify if you want to remove the property recursively Refresh This action will refresh the properties for the current resource Console View Description The Console View shows the communication between your clie
172. s action is only enabled when the resource history was requested for a working copy item 56 The Syncro SVN Client Directory Change Set View The result of comparing two reference revisions from the history of a folder resource is a set with all the resources changed between the two revision numbers and contained in the folder or in a subfolder of the folder These resources are presented in a tree format and for each changed resource of the set all the revisions committed between the two reference revision numbers are presented Figure 3 18 Directory Change Set View Directory Change Set fuserquide trunk Oo x From revision 3175 to revision 3592 ao fuserguide trunk usermanual xml ca sa_proxy d Action Revision Date Author Message ny a_svn_edit Modified 3557 2008 01 03 17 23 52 sorin Added problems of split editors on startup and grey wi A ES sa_svn_glob 2008 01 03 15 33 21 sorin Added a common problem for the leopard issue with no ES s a syn histe Modified 3481 2007 12 14 17 32 39 sorin Screenshots with Saxon 9 instead of Saxon 8 Note ad i mes Modified 3479 2007 12 14 15 10 52 sorin Documented SOAP 1 2 support Changed version of 5 E a svn_pro gt Modified 3456 2007 12 13 18 21 38 sorin Documented more features for oxygen 9 1 S sa syn revi Modified 3445 2007 12 13 14 28 33 Isorin Documented WebDAY lock support ES sa s
173. s for extending the set of revisions presented in the view Get next 50 and Get all Note When using Subversion servers older than version 1 2 a history request may take a very long time because the server will reply with the entire history even if you limited the number of entries to a smaller number The History filter field When only the history entries which contain a specified substring need to be displayed in the History view the filter field displayed at the top of this view is the perfect fit Just enter the search string in the field next to the label Find Only the items with an author name commit message revision number or date which match the search string is kept in the History view The filter action is executed and the content of the table is updated when the button Search is pressed Features Single selection actions e Compare with working copy compares the selected revision with your working copy file It is enabled only when you select a file Open opens the selected revision of the file into the Editor This is enabled only for files e Open with Displays the Open with dialog for specifying the editor in which the selected file will be opened e Get Contents replaces the current version from the working copy with the contents of the selected revision from the history of the file The BASE version of the file is not changed in the working copy so that after this action the file will ap
174. s with the same name if a previous version of the application is installed in the same folder The overwrite parameter added after q forces overwriting these files If the installer is executed in silent unattended mode and console is passed as a second parameter after q a console will be allocated on Windows that displays the output of the installer The command for running the installer is in this case start wait syncroSVNClient ex q console By default an unattended installation applies the default settings of the installer If you want to install the application on a large number of computers but you need to change the default values of some settings like the install folder on disk whether a desktop icon or a quick launch shortcut are created the file associations created in the operating system the name of the program group on the Start menu etc then you should use a special settings file which specifies the new values for these settings To generate the settings file you have to run the installer in normal attended mode once on a test computer and specify the exact options that you want for the unattended installation When Installation the installation is completed a file called response varfile and containing your selected options is created in the instal143 subfolder of the installation folder by default C Program Files Syncro SVN Client 5 1 instal14j on Windows This is a one time process After that for apply
175. scrollbar is necessary Incoming color The color used for incoming changes on the vertical bar that shows the differences between the files compared Outgoing color The color used for outgoing changes on the vertical bar that shows the dif ferences between the files compared Conflict color The color used for conflicts on the vertical bar that shows the differences between the files compared Archive from lt oXygen gt XML Diff The Archive preferences panel is opened from menu Options gt Preferences Archive 132 Configuring the application Figure 5 13 The Archive preferences panel Archive Archive backup options No backup O Single file backup O Incremental backup Archive types Extensions zip jar ear war odb odf odg odm odp ods odt otg oth otp ots Type zip Description ZIP archive jar Java archive Open Document Format ODF docx pptx xlsx dotx docm dotm pptm potx pot Office Open XML OOXML epub IDPF The following options are available in the Archive preferences page The following archive backup op tions are considered default options for backup in the Archive Backup dialog No backup Single file backup Incremental backup Perform no backup of the archive before save This means that the file will be saved directly in the archive without any additional precau tions Before any o
176. source in the local working copy Revert svn revert recursive PATH recursive specifies that he operation should be performed recursively PATH the local working copy path to revert Cleanup svn cleanup PATH PATH the working copy path to cleanup Show Refresh Properties svn proplist PATH amp svn propget PATH the local path for the resource PROPNAME PATH PROPNAME the property name First you can discover the property names with svn proplist then you can obtain their values with svn propget 110 The Syncro SVN Client Branch Tag svn copy m log message URLI m log message the commit comment URL2 or svn copy m log message URLI rev URL2 or svn copy m URLI the source repository URL log message PATH URL a revl the revision of the source URL2 the destination repository URL PATH the source working copy path URL the destination repository URL Merge Merge svn merge dry run dry run specifies that the operation will be simulated rev rev2 URL PATH or svn merge without making any modifications dry run URLI O rev URL20Orev2 PATH URL the repository URL for the resource to merge URLI the repository URL for the start branch to merge rev the start revision for the resource to merge URL2 the repository URL for the end branch to merge rev2 the end revision for the resource to merge PATH the destination path in the working copy for the result
177. sources associated with the bug tracking system Usually they are set recursively on the root folder of the working copy bugtraq message bugtraq label bugtraq url bugtraq warnifnoissue bugtraq number bugtraq append A string property If it is set the Commit dialog will display a text field for entering the bug ID It must contain the string BUGID which is replaced with the bug number on commit A string property that sets the label for the text field configured with the bugtraq message property A string property that is the URL pointing to the bug tracking tool The URL string should contain the substring BUGID which Syncro SVN Client replaces with the issue number That way the resulting URL will point directly to the correct issue A boolean property with the values true yes or false no If set to true then Syncro SVN Client will warn you if the bug ID text field is left empty The warning will not block the commit only give you a chance to enter an issue number A boolean property with the value true or false If this prop erty is set to false then any character can be entered in the bug ID text field Any other value or if the property is missing then only numbers are allowed as the bug ID A boolean property If set to false then the bug ID is inserted at the beginning of the commit message If yes or not set then it s appended to the commit message 52 The Syncro SVN Client
178. support syncrosvnClient com gt All licenses are obtained from the Syncro SVN Client web site http www syncrosvnClient com For definitions and legal details of the license types available for Syncro SVN Client you should consult the End User License Agreement received with the license key and available also on the Syncro SVN Client website at http www syncrosvnClient com eula html Once you have obtained a license key the installation procedure is described below Named User license registration 1 Save a backup copy of the message containing the new license key 2 Start the application 3 Copy to the clipboard the license text as explained in the message 4 If this is a new install of the application then it will display automatically the registration dialog when it is started In the case you already used the application and obtained a new license use the menu option Help Register to make the registration dialog appear Installation Figure 2 1 Registration Dialog Syncro SVN Client v5 License Obtain a license key Tf you do not have a license key you can obtain it in one of the Following ways Request a free 30 day trial license key Request a TRIAL license Purchase a permanent license key BUY Now If you have a registration code obtain a license key Request license for registration code Use a license key After you received the license key either trial or permanent paste it below No
179. t Show Package Contents then in the Contents directory you edit the file Info plist in the key VMOptions you modify the parameter if it already exists in that key or you add it after the model of the existing parameters inside that key On the Linux platform you have to create a file called syncroSVNClient vmoptions if it does not exist already and specify the parameter exactly as in the case of the vmoptions file on the Windows platform If you use the All platforms distribution you have to add or modify the startup parameter that you want to set in the java command line at the end of the startup script syncroSVNClient bat on Windows syncroSVNClientMac sh on Mac OS X and syncroSVNClient sh on Linux All these files are located in the installation directory For example for setting the maximum Installation amount of Java memory to 600 MB on Windows the Xmx parameter must be modified in the java command at the end of syncroSVNClient bat like this java Xmx600m Dsun java2d noddraw true on Mac OS X the java command at the end of syncroSVNClientMac sh should look like java Xdock name SyncroSVNClient Dcom oxygenxml editor plugins dir SSYNCRO_SVN_CLIENT_HOME plugins Xmx600m and on Linux the java command at the end of syncroSVNClient sh should look like java Xmx600mX Dcom oxygenxml editor plugins dir SSYNCRO_SVN_CLIENT_HOME plugins Starting the application As a Java based application the
180. t com download html for every archive You should check the MD5 sum of the downloaded archive with a MDS5 checking tool available on your platform Environment Prerequisites Prior to installation ensure that your Operating System environment complies with the following Installation e Syncro SVN Client supports only official and stable Java virtual machine versions 1 5 0 and later from Sun Microsystems available at http java sun com and from Apple Computer pre installed on Mac OS X For Mac OS X Java VM updates are available at ht tp www apple com macosx features java Syncro SVN Client may work very well with JVM implementations from other vendors but the eventual incompatibilities will not be solved in further Syncro SVN Client releases Syncro SVN Client does not work with the GNU libgcj Java virtual machine http www oxygenxml com forum ftopic1887 html It is recommended to use Java virtual machine 1 6 0 or later for better performance e The PATH environment variable is set to the most current Java VM installation e References to older Java VM installations are removed from the PATH Installation Instructions Prior to proceeding with the following instructions please ensure that your system complies with the prerequisites detailed in the installation requirements g Note The following instructions assume that a Java Runtime Environment JRE is installed If you have downloaded an installation package t
181. tains the following actions e Open in compare editor if the selected file has a text content type it will be opened in the Compare view and a file differencing will be performed If the file has a binary content type then the position of the first different byte will be displayed It is disabled for directories See also View differences section D Open it is enabled existing local files and folders In case of a file the action opens the selected file into the Editor See also Edit files section In case of a folder the action opens the selected 89 The Syncro SVN Client folder with the system application for folders for example Windows Explorer on Windows Finder on Mac OS X etc Open with Displays the Open with dialog for specifying the editor in which the selected file will be opened In case multiple files are selected only external applications can be used to open the files Synchronize synchronizes recursively the resources from the displayed synchronize tree s root folder or all the working copy if no synchronize information is available in the view Update it is enabled for resources with incoming changes Updates all selected resources to the HEAD revision If one of the selected resources is a directory then the update for that resource will be recursive Commit itis enabled for resources with outgoing changes Commits all selected resources recursively in the case of directories to
182. te that the license key usually received in a registration email is composed of nine lines of text gt Registration_Mame User Name Company User Company Category Enterprise Component SYN Client Wersion 5 Number_of_Licenses 1 Date 12 14 2009 Maintenance 350 SGN MCwWCFHUZI69UOb9 YdyDXRESEBeRSNRYARQIj89RFWgrTPCo9bYnxti6kptGQl 1 B al Help Cancel Help cancel 5 Paste the license text in the registration dialog and press OK You have the following alternative for the procedure of license install 1 Save the license key in a file named 1icensekey txt 2 Copy the file in the ib subfolder of the application folder In that way the license will not be asked when the application will start 3 Start the Syncro SVN Client application License registration with a registration code If you have only a registration code and you want to register the associated license key you must request this license key by filling the registration code and other details associated with your license in a request form on the Syncro SVN Client website The button Request license for registration code in the registration dialog available from menu Help gt Register opens this request form in the default Web browser on your computer 10 Installation Upgrading the Syncro SVN Client applic ation From time to time upgrade and patch versions of Syncro SVN Client are released to prov
183. the icon for a resource removed and replaced with another one on the repository and orange background indirect resource the icon for a revision from where the resource was copied or an indir ectly modified resource that is a directory in which a resource was modified and grey background the Modification type field of the tooltip specifies how that revision was obtained in the history of the resource A directory resource is represented with two types of graphs simplified graph lists only the changes applied directly to the directory complete graph lists also the indirect changes of the directory resource that is the changes applied to the resources contained in the directory 103 The Syncro SVN Client Figure 3 39 The Revision Graph of a Directory Direct Changes A 158240180 Ht suserguidestruntsimg 747 ite juserguideltrunkimg 746 104 The Syncro SVN Client Figure 3 40 The Revision Graph of a Directory Also Indirect Changes Revision Graph userguide trunk img BAX Hela aA n SR y Notused Juserguideltrunklimg 889 f Documented new ia luserguideltrunkimg 780 A Removed wrong trur Juserguideltags 2itru E Removed wrong tag wihc fuserguideltrunkitrunkfimg 749 PP Release 7 2 P Release 7 2 luserguideltags 7 2 img 748 luserguideltags 7 2 tru Release 7 2 P ihe fuserguidestrunklimg 747 w Juserguide trunkitrunklimg 747 P b ite f
184. the next difference e Go to Last Modification used to navigate to the last difference e i Copy All Non Conflicting Changes from Right to Left this action copies all non conflicting changes from the right editor to the left editor A non conflicting change from the right editor is a change that does not overlap with a left editor change e Copy Change from Right to Left this action copies the selected change from the right ed itor to the left editor e amp Show Modification Details at Word Level because the differences are computed using a line differencing algorithm sometimes is useful to see exactly what words are different in a changed section e amp Show Modification Details at Character Level useful when you want to find out exactly what characters are different between the two analyzed sections e El Ignore Whitespaces Enables or disables the whitespace ignoring feature Ignoring whitespace means that before the strings are compared they are first normalized and then the whitespace at the beginning and the end of the strings is trimmed History Show History display the history for a SVN resource at a given revision The resource can be one selected from the Repository view Working Copy View Synchronize View or from the Affected Paths table from the History View depending on which view was last focused when this action was invoked il Show Annotation brings up a dialog for selecting the start
185. the proxy cannot be read cor rectly from the operating system on some Linux sys tems The system settings option should work properly on Gnome based Linux systems but it does not work yet on KDE based ones as the Java virtual machine does not offer the necessary support yet http bugs sun com bugdatabase view_bug do bug_id 6385839 When checked the HTTP and HTTPS connections go through the proxy server specified in the fields Address and Port of the section Web Proxy HTTP HTTPS Also this section specifies the hosts to which the connections must not go through a proxy server In this section one must set the user and password necessary for authentication with the proxy server The user and pass word set here will be used both in case of manual proxy configuration and in case of system settings selected above In this section one must set host and port of a SOCKS proxy through which all the connections must pass If the Address field is empty the connections will use no SOCKS proxy If checked and the SVN server accessed by the https protocol requires a digital certificate then the user is asked to specify the file containing a certificate in the PKCS format for ac cessing that server The period in seconds after which the application will con sider a HTTP server is unreachable if it does not receive any response to a request sent to that server The proxy settings are first looked up in the options If there were no previous op
186. then the versioned symbolic links on Linux and OS X are supported in the same way as on Windows i e a text file instead of symbolic link is created Important It is recommended to disable symbolic links support if you do not have versioned symbolic links in your repository because the SVN operations will work faster However you should not disable this option when you do have versioned symbolic links in repository In that case a workaround would be to refer to working copy by its real path not path that includes a symbolic link Allow unversioned obstructions This options controls how should be handled working copy resources being ignored unversioned when performing an update operation and from the repos itory are incoming files with the same name in the same location that intersect with those being ignored unversioned If the option is enabled then the incoming items will become BASE revision of the ones already present in the working copy and those present will be made versioned re sources and will be marked as modified Exactly as if the user first made the update operation and after that he she modified the files If the option is disabled the update operation will fail when encountering files in this situation possibly leaving other files not updated By default this option is enabled Use unsafe copy operations Sometimes when the working copy is accessed through Samba and SVN client cannot make a safe copy of the comm
187. tions set then the settings are loaded from the servers file located in the HOME Application Data Subversion folder on Windows and HOME subversion folder on Linux and Mac OS X Messages from lt oXygen gt XML Diff The Messages preferences panel is opened from menu Options Preferences Messages 139 Configuring the application Figure 5 19 The Messages preferences panel Show archive backup dialog This page allows disabling warning messages which may appear in the application Show archive backup dialog If checked a dialog will be shown allowing the user different backup options before modifying an archive s content Messages The Messages preferences panel is opened from menu Options Preferences Messages Figure 5 20 The Messages preferences panel Messages Show warning dialog when editing conflicts C Show confirmation dialog for drag and drop actions in Working Copy This page allows disabling warning messages which may appear in the application Show warning dialog when editing If checked when the Edit Conflicts action is executed in the conflicts SVN Client a dialog will be shown that warns you that the action will overwrite the conflicted version of the file created by an update operation The conflicted file will be overwrit ten with the version of the same file which existed in the working copy before the update operation and then proceeds with the visual editing of the
188. tween the two reference revision numbers Selecting one revision in the list displays the commit message of that revision in the bottom area of the right side panel A double click on a file listed in the left side tree performs a diff operation between the two revisions of the file corresponding to the two reference revisions of the folder for which the change set was computed A double click on one of the revisions displayed in the right side list of the view performs a diff operation between that revision and the previous one of the same file The context menu of the right side list contains the following actions Compare with previous version Performs a diff operation between the selected revision in the list and the previous one 57 The Syncro SVN Client Open Open the selected revision in the associated editor type Open with Displays a dialog with the available editor types and allow the user to select the editor type for opening the selected re vision Save revision to Save the selected revision in a file on disk Show Annotation Request the annotations of the file and display them in the Annotations view Management of SVN properties In the Properties view you can read and set the Subversion properties of a file or folder There is a set of predefined properties with special meaning to Subversion For more information about properties in Subversion see the SVN Subversion specification Subversion properties are r
189. uld simply type the revision number in the corresponding text field Please note that the content of the selected directory from the repository and not the directory itself will be exported to the file system Copy Move Delete resources from the repository Once you have a location defined in the Repository view you can execute commands like copy move and delete directly on the repository The commands correspond to the following actions in the contextual menu The Copy action allows you to copy individual or multiple resources After invoking the action the Copy file dialog will pop up The dialog displays the path of the resource that is copied and the tree structure of the repository allowing you to choose the destination directory The path of this target directory will be presented in the text field Destination Directory If you choose to copy a single resource then an additional checkbox and a text field allow you to choose the new name of the copied resource The Move action will display a similar dialog allowing you to move the selected resources to a different folder If you choose to move a single resource you can also change its name This will allow you to rename a resource by moving it into the same parent directory but choosing a different name The move operation is basically a copy operation followed by a delete operation If you select a directory any other selected descendants will be ignored when you have issued the move comm
190. used The System Default choice sets the line separator from the platform Detect the line separator on file open When this option is checked the editor will detect the line separator when the edited file is loaded and it will use it when the file is saved The new files are saved using the line separator defined by the Line separator option Show Java vendor warning at startup Sun Microsystems Java VM or Apple Computer Java VM on Mac OS X is required to run lt oXygen gt If a different VM is used then a warning is generated This option allows the user to choose whether the warning dialog is shown in this case or not Show hidden files and directories Show system hidden files and folders in the file and directory browsers This setting is not available on Mac OS X Fonts The Fonts preferences panel is opened from menu Options Preferences Fonts Figure 5 4 The Fonts preferences panel Fonts Text antialiasing DEFAULT Text components cul Editor Use this option to select the font family and size used to display text in the editor Text antialiasing Enable text antialiasing at the specified level On JVM versions prior to 1 6 this combo box contains only the values Default On and Off Default means that Syncro SVN Client will not set anything special for text antialiasing but the JVM will use the setting of the operating system if it is available The On option sets the text antialiasing to pixel level a
191. userguidestrunklimg 746 v The Revision graph dialog toolbar contains the following actions Save the graphical representation as image For a large revi sion graph you have to set more memory in the startup script The default memory size is not enough when there are more than 100 revisions that are included in teh graph EH Save as image 5 Show Hide indirect modifications Switch between simplified and complete graph Zoom In Zoom In the graph A Zoom Out Zoom Out the graph When the font has the minimum size zoom out to last level the text content is not displayed in nodes anymore only the icon is displayed and the distances between graph nodes are smaller so that the graph has a more compact representation 1 1 Reset scale Reset the scale of the graphical representation 105 The Syncro SVN Client Print Print the graphical representation Print preview Print preview for the graphical representation The right click menu of a node of the graph contains the following actions Open available only for files opens the selected revision in the editor panel Open with available only for files opens the selected revision in the editor panel Compare with HEAD available only for files compares the selected revision with the HEAD revision and displays the result in the diff panel Show History available for both files and directories displays the history of the resource in the History v
192. versioned userquide img sa_svn_copy_Ffiles_dlg gif modified userguide img tip gif unversioned userguidefimg warning gif unversioned userguide standalone profiled Fo unversioned ly Select all Deselect all Keep locks TT TT Enter a comment to associate with the commit or choose a previously entered comment from the list the last 10 commit messages will be remembered even after restarting the SVN client applica tion The dialog will list modified added deleted and unversioned resources All modified added and deleted resources will be selected by default If you don t want a changed file to be committed just uncheck that file The unversioned items are not selected by default unless you have selected them specifically before issuing the commit command To select all resources click Select All To deselect all resources click Deselect All Checking the Keep locks option will preserve any locks you have on repository resources Your working copy must be up to date with respect to the resources you are committing This is ensured by using the Update action prior to committing resolving conflicts and re testing as needed If your working copy resources you are trying to commit are out of date you will get an appropriate error message The table presented in the dialog is sortable For example if you want to see all the resources that are in the modified state click on the State column h
193. which means you first have to commit your working copy to make those resources available to other developers Adding a resource to version control does not affect the repository If you try to add to version control an unversioned directory the entire subtree starting with that directory will be added When you commit your changes if you forgot to add a resource it will still be presented in the commit dialog but will be de selected by default When you commit the unversioned resource it will be automatically added to version control before being committed and the marking will also be removed Ignore resources not under version control Sometimes you will have files and folders inside your working copy that should not be subject to version control These might include files created by the compiler obj class 1st maybe an output directory used to store the executable Whenever you commit changes Subversion shows your modified files but also the unversioned files which fills up the file list in the commit dialog Though the unversioned files will not be committed unless otherwise specified it is difficult to see exactly what you are committing The best way to avoid these problems is to add the derived files to the Subversion s ignore list That way they will never show up in the commit dialog and only genuine unversioned files which must be committed will be shown You can choose to ignore a resource by using the Add to svn ignore
194. word or string of characters including white spaces that can be on a line or on multiple lines defined in the Replace with area e Replace all occurrences of a word or string of characters including white spaces that can be on a line or on multiple lines Figure 4 1 Find Replace Dialog 5 Find Replace Texttofnd O Repl count prew gt 0 Replace all Replace with Replace to end Direction Scope Forward O All Backward Only selected lines Options C Case sensitive Whole words only C Incremental C Regular expression C Wrap around The dialog contains the following fields options Text to find The target character string to search for The string can be on a line or on multiple lines Special characters like newline and tab can be inserted using the contextual menu You can search for Unicode characters specified in the uNNNN format Also hexadecimal notation xNNNN and octal notation ONNNN can be used Note that in this case you have to check the Regular expression checkbox For example to search a space character you can use u0020 code Replace with The character string with which to replace the target The string for replace can be on a line or on multiple lines Spe 115 Text editor specific actions The Find and Replace history buttons Direction Scope Find Replace Replace all Replace to end Case sensitive Whole words only
195. y You can also select the update depth 20 The Syncro SVN Client for the current folder You can find out more about the depth term in the sparse checkouts section The action is active only on resources under version control Update all updates all resources from the working copy that have incoming changes on the Synchronize view It will perform a recursive update on the synchronized resources Commit itis enabled for the resources that have outgoing changes and commits all selected resources recursively in the case of directories to the repository The resources to be committed will be taken from the Working Copy view or from the Synchronize view depending on which view was last focused when this operation was invoked This action collects the outgoing changes from the selected resources and presents them in a dialog Commit all commits all the resources with outgoing changes It is disabled when Incoming mode is selected or the synchronization result does not contain resources with outgoing changes It will perform a recursive commit on the synchronized resources Revert allows you to undo all changes you made into a folder or into a file since the last update To read more about this operation see Revert your changes Edit conflict opens a Compare view for editing the selected conflict from the Working Copy view or from the Synchronize View depending on which view was last focused when invoking this operat
196. y back to the repository more exactly the locally modified files When you are ready to create the new branch tag write a commit comment in the corresponding field and press the OK button Merging At some stage during the development you will want to merge the changes made on one branch back into the trunk or vice versa Merge is closely related to Diff The merge is accomplished by comparing two points branches or revisions in the repository and applying the obtained differences to your working copy It is a good idea to perform a merge into an unmodified working copy If you have made changes to your working copy commit them first If the merge does not go as you expect you may want to revert the changes and Revert cannot recover your uncommitted modifications The Merge command can be found in the Tools main menu of the Syncro SVN Client The directory selected when you issued the command will be the result directory of the merge operation There are three common types of merging which are handled in different ways as described below The first page of the merge operation wizard allows you to select the merging method Figure 3 20 The Merge type dialog E Merge Select the type of merge Merge type Merge Select this if you want to merge two revisions From the same tree Reintegrate a branch Select this if you want to reintegrate a branch back to trunk Merge two different trees Select this i
197. yn revi Modified 3433 2007 12 12 18 19 51 sorin Documented new features For release 9 1 sa_svn_synt Modified 3431 2007 12 12 11 59 43 sorin Fixed DocumentationTest i sa_svn_synt Modified 3430 2007 12 11 17 21 39 sorin More detailed descriptions of the fields of a transforma E al ane Modified 3401 2007 12 06 15 34 03 sorin Shorter lines in programlisting elements so that progra gt s a_xquery Modified 3400 2007 12 05 17 02 43 sorin Fixed indentation of lt screen gt elements E sa_xslt_saxd Modified 3360 2007 12 03 15 46 43 sorin Added note about DnD for move in Working Copy view y lt q ihCustomLayer gt Commit message lt PdfCustomLayer Gs userguide css Added a common problem For the leopard issue with not switching to the Leopard space containing the oxygen window when the Eu r oxygen application is selected with Command Tab lt qq usermanual xml v gt Console Y History Directory Change Set x The set of changed resources displayed in the tree is obtained by running the action Compare revi sions available on the context menu of the History view when two revisions of a folder resource are selected in the History view The left side panel of the view contains the tree hierarchy with the names of all the changed resources between the two reference revision numbers The right side panel presents the list with all the revi sions of the resource selected in the tree that were committed be

Download Pdf Manuals

Related Search

Related Contents

AirConServiceCenter ASC5000  User Guide  Réfrigérateur-Congélateur Fridge-Freezer Ijskast  User's Guide  

Copyright © All rights reserved. Failed to retrieve file