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/09/19 12:31] zeman Opraveny nerozbalené entity pro menšítka a většítka. |
||
---|---|---|---|
Line 66: | Line 66: | ||
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 99: | ||
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 372: | ||
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 393: | ||
</ | </ | ||
- | === [[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 === | + | ===== 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 433: | ||
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.: '' | + | |
- | + | | |
- | : $ 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).: '' | + | |
- | + | ||
- | : $ Change your mind when you realize those bug fixes did more harm than good.: '' | + | |
- | + | ||
- | === Troubleshooting === | + | ===== Troubleshooting |
If you get the message: | If you get the message: | ||
Line 448: | Line 461: | ||
* pray | * pray | ||
- | === Further Reading === | + | ===== Further Reading |
All of the information in this tutorial comes directly from the online [http:// | All of the information in this tutorial comes directly from the online [http:// |