Beefy Boxes and Bandwidth Generously Provided by pair Networks
"be consistent"
 
PerlMonks  

Comment on

( #3333=superdoc: print w/ replies, xml ) Need Help??

I have to second this, as SVK takes care of a lot of merge tracking for you. It does requires some different thinking as it replicates a repository to your computer and then manages the synchronization from there. See the SVK Wiki for more details and some guides.

In SVK, people seem to usually make a local branch on their computer rather than a branch in the repository and work there. It might work like this:

# create a location for remote and local mirrors $ svk mkdir //mirror $ svk mkdir //local # establish the mirror to a remote repo $ svk mirror https://some_repo.url/ //mirror/some_repo # sync the head revision to your mirror $ svk sync -s HEAD # create the local branch $ svk cp -m "branching" //mirror/some_repo/trunk //local/some_repo # check it out $ svk co //local/some_repo # hack hack hack $ cd some_repo $ $EDITOR bar.pm # check in changes to the branch $ svk ci -m "log message" # merge in changes from the trunk (same as svk up -sm) # this does a smart merge from where the last copy was made $ svk pull # hack hack hack and check in changes # merge branch back into the trunk $ svk push

I think you can also do this entirely on a remote branch, too, like this (though there are other ways):

# create a location for mirrors $ svk mkdir //mirror # establish the mirror to a remote repo $ svk mirror https://some_repo.url/ //mirror/some_repo # sync the head revision to your mirror $ svk sync -s HEAD # create the branch $ svk cp -m "branching" //mirror/some_repo/trunk //mirror/some_repo/br +anches/foo # check it out $ svk co //mirror/some_repo/branches/foo # hack hack hack $ cd foo $ $EDITOR bar.pm # update from branch (but sync first) $ svk up -s # check in changes to the branch $ svk ci -m "log message" # merge in changes from the trunk (same as svk up -sm) # this does a smart merge from where the last copy was made $ svk pull # hack hack hack and check in changes # merge branch back into the trunk $ svk push

-xdg

Code written by xdg and posted on PerlMonks is public domain. It is provided as is with no warranties, express or implied, of any kind. Posted code may not have been tested. Use of posted code is at your own risk.


In reply to Re^2: [OT] Best Use of Subversion Branches in Perl Development by xdg
in thread [OT] Best Use of Subversion Branches in Perl Development by jkeenan1

Title:
Use:  <p> text here (a paragraph) </p>
and:  <code> code here </code>
to format your post; it's "PerlMonks-approved HTML":



  • Posts are HTML formatted. Put <p> </p> tags around your paragraphs. Put <code> </code> tags around your code and data!
  • Read Where should I post X? if you're not absolutely sure you're posting in the right place.
  • Please read these before you post! —
  • Posts may use any of the Perl Monks Approved HTML tags:
    a, abbr, b, big, blockquote, br, caption, center, col, colgroup, dd, del, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, ins, li, ol, p, pre, readmore, small, span, spoiler, strike, strong, sub, sup, table, tbody, td, tfoot, th, thead, tr, tt, u, ul, wbr
  • Outside of code tags, you may need to use entities for some characters:
            For:     Use:
    & &amp;
    < &lt;
    > &gt;
    [ &#91;
    ] &#93;
  • Link using PerlMonks shortcuts! What shortcuts can I use for linking?
  • See Writeup Formatting Tips and other pages linked from there for more info.
  • Log In?
    Username:
    Password:

    What's my password?
    Create A New User
    Chatterbox?
    and the web crawler heard nothing...

    How do I use this? | Other CB clients
    Other Users?
    Others musing on the Monastery: (15)
    As of 2014-07-24 20:27 GMT
    Sections?
    Information?
    Find Nodes?
    Leftovers?
      Voting Booth?

      My favorite superfluous repetitious redundant duplicative phrase is:









      Results (167 votes), past polls