Changes between Version 22 and Version 23 of OurTutorial


Ignore:
Timestamp:
Oct 14, 2022, 8:48:43 PM (2 years ago)
Author:
jac
Comment:

Use https download, adapt wording

Legend:

Unmodified
Added
Removed
Modified
  • OurTutorial

    v22 v23  
    33SVN = Subversion = manager for file repositories with full change history.
    44
    5 Trac = a web application that includes a wiki, SVN view and tickets.
     5Trac = a web application that includes a wiki, SVN view, and tickets.
    66
    77Ticket = submitted bug or idea, e.g. jhusak submitted ticket:1 for putting ASMA in the SVN and pfusik did it.
     
    1111Make sure Trac interface is in English. Polish translation is incomplete.
    1212
    13 On the top click Preferences, Language, English (United States), Save 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, 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 it yet
     34 * branches - for the more advanced users, we don't use them yet
    3535 * tags - contains tagged versions, usually releases and sometimes betas, we don't edit files directly here
    36  * trunk - it's the main work space, you can browse it from Trac, but it's much more comfortable to have a copy on your disk (see below)
     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
    38 Every write to SVN is registered in its history - which you see in Timeline. A write is a "changeset". A changeset has the following attributes:
     38Every update to SVN is registered in its history - which you see in Timeline. A write is a "changeset". A changeset has the following attributes:
    3939 * ordinal number
    4040 * author's login
    4141 * timestamp
    42  * log message - short text written by the author to summarize the change
     42 * log message - a short text written by the author to summarize the change
    4343 * the changes - added/changed/removed files or directories
    4444
     
    4747== TortoiseSVN Installation ==
    4848
    49 http://tortoisesvn.net/downloads.html
     49https://tortoisesvn.net/downloads.html
    5050Choose 32-bit or 64-bit to match your Windows version.
    5151Any installation is fine, you can uncheck the unnecessary things such as extra icons, command-line tools and dictionaries.
     
    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 repository paste:
     56Create 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:
    5757{{{svn://asma.scene.pl/asma/trunk}}}
    58 Make sure that Checkout directory is exactly your empty directory. Click OK and wait for the download.
     58Make 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, delete, rename and move must be done specially (see 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 which 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), 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 Update.
     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 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.
    7575
    76 To 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.
     76To 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.
    7777
    7878To delete a file '''don't just delete it'''. Instead, TortoiseSVN / Delete, then SVN Commit.
     
    8888== Viewing changes ==
    8989
    90 Install TortoiseSvnDiff. It's optional, but strongly recommended.
     90Install TortoiseSvnDiff. It is optional but strongly recommended.