Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>In short:</p> <ul> <li>branch server side</li> <li>synchronize merge single direction (from trunk to branches/feature)</li> <li>merge back (reintegrate) once for all (this will close the branch)</li> </ul> <p>This my current recommended workflow with svn based on some notes. Words in between &lt; and > are place holders.</p> <p><strong>Tips:</strong></p> <p>T1: use the symbols "^/" to refer to your base repository. From anywhere in your project you can list against the repository with:</p> <pre><code>svn list ^/&lt;repo_path&gt; </code></pre> <p>T2: to now on which branch you are currently working use </p> <pre><code>svn info | grep URL </code></pre> <p><strong>Recommendations:</strong></p> <p>R1: do not checkout the top project dir (the one containing trunk/ branches/ and tag/) but the trunk dir itself, i.e.:</p> <p>don't do:</p> <pre><code>svn checkout &lt;BASE_URL&gt;/svn/&lt;proj&gt; </code></pre> <p>but do:</p> <pre><code>svn checkout &lt;BASE_URL&gt;/svn/&lt;proj&gt;/trunk workdir </code></pre> <p>and use switch.</p> <p>R2- When branching, always do it server side to avoid copying.</p> <p>dont'do:</p> <pre><code>svn cp workdir/trunk workdir/branches/feature </code></pre> <p>do:</p> <pre><code>svn cp ^/trunk ^/branches/feature </code></pre> <p>followed by:</p> <pre><code>cd &lt;workdir_path&gt; svn sw ^/branches/feature </code></pre> <p>R3: only merge (synchronize) from trunk to your branch.</p> <pre><code>cd &lt;workdir_path&gt; svn merge ^/trunk </code></pre> <p>R4: to merge on the other direction (from branch to trunk) use reintegrate merge.</p> <pre><code>svn up svn switch ^/trunk svn merge --reintegrate ^/branches/&lt;feature&gt; (resolve conflicts and ...) svn ci </code></pre> <p>Exception: If you need to cherry-pick a change to the trunk, you may preffer to do it with the --ignore-ancestry (to avoid complication with history)</p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload