Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
subversion [2007/10/08 12:21] zeman Přeuspořádání. |
subversion [2008/12/02 18:54] bojar caste problemy s tracem |
||
---|---|---|---|
Line 32: | Line 32: | ||
O přidávání uživatelů a hesel viz níže. | O přidávání uživatelů a hesel viz níže. | ||
- | ==== Konfigurace protokolu SVN ==== | + | |
+ | ==== Konfigurace protokolu SVN (raději nepoužívat, | ||
Toto rozhraní je užíváno SVN klienty, kteří dostanou repository udanou ve tvaru '' | Toto rozhraní je užíváno SVN klienty, kteří dostanou repository udanou ve tvaru '' | ||
Line 46: | Line 47: | ||
Pozor - hesla se tu nastavuji jako textove retezce, neni to htaccess! Po siti tedy tecou nekryptovane! | Pozor - hesla se tu nastavuji jako textove retezce, neni to htaccess! Po siti tedy tecou nekryptovane! | ||
+ | |||
==== Konfigurace přístupu k systému Trac ==== | ==== Konfigurace přístupu k systému Trac ==== | ||
Line 57: | Line 59: | ||
trac-admin / | trac-admin / | ||
+ | === Časté problémy === | ||
+ | |||
+ | == V tracu chybí tlačítko Browse Source == | ||
+ | |||
+ | Ověřte, že v souboru ''/ | ||
+ | |||
+ | == V prohlížení kódu se neukazuje Unicode == | ||
+ | |||
+ | Ověřte, že v souboru ''/ | ||
==== Přidávání vlastních uživatelů pro webové přístupy (SVN i Trac) ==== | ==== Přidávání vlastních uživatelů pro webové přístupy (SVN i Trac) ==== | ||
Line 66: | Line 77: | ||
htpasswd -s / | htpasswd -s / | ||
# na heslo budete dotázáni, heslo se nezobrazí ani na terminálu | # na heslo budete dotázáni, heslo se nezobrazí ani na terminálu | ||
+ | |||
===== Lokální Subversion ===== | ===== Lokální Subversion ===== | ||
Line 98: | Line 110: | ||
rm -rf proj.old | rm -rf proj.old | ||
</ | </ | ||
+ | |||
+ | Výše uvedený postup je možné po úpravách použít i pro vzdálený repozitář na serveru SVN. Předpokládáme, | ||
+ | |||
+ | < | ||
+ | mv $PROJ $PROJ.old | ||
+ | mkdir tmp | ||
+ | cd tmp | ||
+ | mkdir $PROJ | ||
+ | cp -r / | ||
+ | mkdir $PROJ/ | ||
+ | mkdir $PROJ/tags | ||
+ | svn --username $USER import $PROJ https:/// | ||
+ | cd .. | ||
+ | svn checkout -q https:/// | ||
+ | rm -rf tmp | ||
+ | rm -rf $PROJ.old</ | ||
+ | |||
+ | Pokud jste si jisti, že pro tento projekt nebudete nikdy potřebovat větve ani otagované verze, můžete pravděpodobně vynechat vytváření podsložek '' | ||
===== Přechod z CVS pod SVN ===== | ===== Přechod z CVS pod SVN ===== | ||
Line 353: | Line 383: | ||
This command takes the differences between the alopez branch from rev. 250 to 271, and applies them to the working copy. Note that this may create conflicts! | This command takes the differences between the alopez branch from rev. 250 to 271, and applies them to the working copy. Note that this may create conflicts! | ||
+ | |||
===== Tags ===== | ===== Tags ===== | ||
Line 373: | Line 404: | ||
</ | </ | ||
- | === [[VersionControlTags|Current Tags and Branches]] === | ||
- | === Rolling Back Versions === | + | |
+ | |||
+ | |||
+ | |||
+ | ===== Rolling Back Versions | ||
What do you do if something is broken that wasn't broken before? | What do you do if something is broken that wasn't broken before? | ||
- | '' | + | '' |
This will show you the change log. Hopefully, this will be sufficiently informative as to when particular changes occurred, but if you aren't sure what happened in a particular revision, you can always run | This will show you the change log. Hopefully, this will be sufficiently informative as to when particular changes occurred, but if you aren't sure what happened in a particular revision, you can always run | ||
- | '' | + | '' |
To see the changes that have been made. Once you figure out which version you need, you can restore your working copy to that revision using | To see the changes that have been made. Once you figure out which version you need, you can restore your working copy to that revision using | ||
- | '' | + | '' |
- | === Setting Up an Archive === | + | Warning: If you update the whole project ('' |
+ | |||
+ | The following chapters from the SVN book have some answers: | ||
+ | * http:// | ||
+ | * http:// | ||
+ | * http:// | ||
+ | |||
+ | The following code should undo the changes between the revisions 302 and 303 (note the minus sign before 303, meaning negative change) while keeping the other changes between 303 and HEAD. | ||
+ | |||
+ | < | ||
+ | # alternatively: | ||
+ | svn status | ||
+ | svn diff | ||
+ | svn commit -m " | ||
+ | |||
+ | ===== Setting Up an Archive | ||
You can use svn to keep track of your own code. Let's say you want to archive the directory ''/ | You can use svn to keep track of your own code. Let's say you want to archive the directory ''/ | ||
Line 414: | Line 463: | ||
See [[VersionControlSetup|VersionControlSetup]] for the series of commands used to set up the MTEval archive. | See [[VersionControlSetup|VersionControlSetup]] for the series of commands used to set up the MTEval archive. | ||
- | === Stupid Repository Tricks === | + | |
+ | ===== Stupid Repository Tricks | ||
You can accomplish virtually anything you can imagine with the repository, although it may not be immediately obvious how. For instance: | You can accomplish virtually anything you can imagine with the repository, although it may not be immediately obvious how. For instance: | ||
- | : $ Get the latest revision number of your current branch | + | * Get the latest revision number of your current branch: '' |
- | :You can also try '' | + | |
- | + | | |
- | : $ View the logs of all changes to your current branch since you last updated.: '' | + | * Merge into your current working copy the bug fixes checked in to r475 of the bittorrent branch (even if that's not your working branch): ''< |
- | + | * Change your mind when you realize those bug fixes did more harm than good: ''< | |
- | : $ View all the differences between your working copy and the latest revision of your current branch.: '' | + | |
- | : $ Merge into your current working copy the bug fixes checked in to r475 of the bittorrent branch (even if that's not your working branch).: '' | + | ===== Troubleshooting |
- | + | ||
- | : $ Change your mind when you realize those bug fixes did more harm than good.: '' | + | |
- | + | ||
- | + | ||
- | + | ||
- | === Troubleshooting === | + | |
If you get the message: | If you get the message: | ||
Line 448: | Line 491: | ||
* pray | * pray | ||
- | === Further Reading === | ||
- | All of the information in this tutorial comes directly from the online [http:// | ||
- | * [http:// | + | ===== Further Reading ===== |
- | * [http:// | + | |
- | * [http:// | + | All of the information in this tutorial comes directly from the online [[http:// |
- | * [http:// | + | |
- | * [http:// | + | |
+ | * [[http:// | ||
+ | * [[http:// | ||
+ | * [[http:// | ||
+ | * [[http:// | ||
Most likely, this is all you will need to look at to do most of your work. Most of this material comes from Section 3.5. | Most likely, this is all you will need to look at to do most of your work. Most of this material comes from Section 3.5. | ||