Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>In my company we use following approach:</p> <ol> <li>for each task NK-$X in the issue tracker we have a separate branch branches/NK-$X</li> <li>we start work on a task by svn cp trunk branches/NK-$X </li> <li>we never commit changes directly to the trunk. For each schedulled update UPDNK-$X we have a separate branches/UPDNK-$X. We create it with svn cp trunk branches/UPDNK-$X just before the update.</li> <li>when the task NK-$X is schedulled for an update UPDNK-$Y we merge branches/NK-$X inot UPDNK-$Y. That is cd UPDNK-$Y; svn merge -r start:HEAD branches/NK-$X</li> <li>after UPDNK-$Y is ready, we merge it to trunk. That is cd trunk;svn merge -r start:HEAD branches/UPDNK-$Y</li> </ol> <p>If it happens that task NK-$X lasts longer than one iteration cycle, and therefore needs refreshing, we never, ever, NEVER merge trunk to NK-$X. We have a rule that you commit to your branch only things that you wrote yourself, which makes everything easier. Instead we do:</p> <pre><code>cd NK-$X svn log //let L = the number of the last changeset to this branch changeset //let F = the number of the first changeset to this branch svn rm branches/NK-$X svn cp trunk branches/NK-$X svn up svn merge -r F:L branches/NK-$X@L svn ci -m 'refereshed' </code></pre> <p>This way, whenever you look at the changelog of branches/NK-$X you see only changes actually performed by the developer.</p> <p><strong>Update:</strong> Since the above workflow can be automated, I've started a project on github: <a href="https://github.com/qbolec/svn_rebase" rel="nofollow">svn rebase</a>.</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. VO
      singulars
      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