Changes between Version 23 and Version 24 of OurTutorial


Ignore:
Timestamp:
Oct 31, 2023, 12:57:26 AM (13 months ago)
Author:
jac
Comment:

Fix wording

Legend:

Unmodified
Added
Removed
Modified

  • OurTutorial

    v23 v24  
    55Trac = a web application that includes a wiki, SVN view, and tickets.
    66
    7 Ticket = submitted bug or idea, e.g. jhusak submitted ticket:1 for putting ASMA in the SVN and pfusik did it.
     7Ticket = submitted bug or idea, e.g. jhusak submitted ticket:1 for putting ASMA in the SVN, and pfusik did it.
    88
    99== Language ==
    … …  
    1111Make sure Trac interface is in English. Polish translation is incomplete.
    1212
    13 On the top click Preferences, Language, English (United States), and Save your changes.
     13On the top, click Preferences, Language, English (United States), and save your changes.
    1414
    1515== Trac navigation ==
    … …  
    2929== SVN Basics ==
    3030
    31 SVN (subversion) is a version control system. In such systems nothing is ever lost, the history of changes is always available with the author, and you can always revert to a previous version and fix any problem (see below).
     31SVN (subversion) is a version control system. In such systems, nothing is ever lost, the history of changes is always available with the author, and you can always revert to a previous version and fix any problem (see below).
    3232
    3333As you can see in the Browse Source tab, there are three top directories in SVN:
    34  * branches - for the more advanced users, we don't use them yet
    35  * tags - contains tagged versions, usually releases and sometimes betas, we don't edit files directly here
    36  * trunk - it's the main workspace, you can browse it from Trac, but it's much more comfortable to have a copy on your disk (see below)
     34 * branches - for the more advanced users. We don't use them yet
     35 * tags - contains tagged versions, usually releases and sometimes betas. We don't edit files directly here
     36 * trunk - it's the main workspace. You can browse it from Trac, but it's much more comfortable to have a copy on your disk (see below)
    3737
    3838Every update to SVN is registered in its history - which you see in Timeline. A write is a "changeset". A changeset has the following attributes:
    … …  
    4949https://tortoisesvn.net/downloads.html
    5050Choose 32-bit or 64-bit to match your Windows version.
    51 Any installation is fine, you can uncheck the unnecessary things such as extra icons, command-line tools and dictionaries.
    52 After the installation the context menu of Windows Explorer gets additional TortoiseSVN commands.
     51Any installation is fine; you can uncheck unnecessary things such as extra icons, command-line tools, and dictionaries.
     52After the installation, the context menu of Windows Explorer gets additional TortoiseSVN commands.
    5353
    5454== Getting a local copy of SVN ==
    5555
    56 Create on your disk an ordinary empty directory to contain your copy of SVN. Let's say it's called asma-trunk (use any name and location you like). Enter this directory in Windows Explorer, click the empty space and select TortoiseSVN / Checkout. In the URL of the repository paste:
     56Create an ordinary empty directory on your disk containing your SVN copy. Let's say it's called asma-trunk (use any name and location you like). Enter this directory in Windows Explorer, click the empty space, and select TortoiseSVN / Checkout. In the URL of the repository, paste:
    5757{{{svn://asma.scene.pl/asma/trunk}}}
    5858Make sure that the checkout directory is exactly your empty directory. Click OK and wait for the download.
    5959
    60 The downloaded files are regular files - you can play and edit them. However, deleting, renaming and moving must be done in a special way described below).
     60The downloaded files are regular files - you can play and edit them. However, deleting, renaming, and moving must be done in a special way described below).
    6161
    6262== Basic SVN commands ==
    … …  
    7272== Making changes ==
    7373
    74 The easiest change is modifying a file that is already in SVN. Modify the file as you normally do - e.g. edit text files in the notepad. Next, choose SVN Commit - it will display the list of modified files. Enter the description of the change in the top edit box (the description is important so that it's easier to browse the history), and accept. Enter your SVN login and password. Our changes are sent to the server and are available for the others, who need to do SVN updates.
     74The easiest change is modifying a file that is already in SVN. Modify the file as you normally do - e.g. edit text files in the notepad. Next, choose SVN Commit - it will display the list of modified files. Enter the change description in the top edit box (the description is important so it's easier to browse the history), and accept. Enter your SVN login and password. Our changes are sent to the server and are available for the others who need to do SVN updates.
    7575
    7676To add a file, put it in the directory, right-click it, and select TortoiseSVN / Add. The file won't be sent to the server until you select SVN Commit, as described above.