Skip to content

Instantly share code, notes, and snippets.

@netdesignr

netdesignr/svn_workflow.sh

Forked from hendrauzia/svn_workflow.sh
Created May 9, 2018 11:39
Download ZIP

Revisions

  1. Hendra Uzia revised this gist Mar 24, 2013. 1 changed file with 5 additions and 0 deletions.
    5 changes: 5 additions & 0 deletions svn_workflow.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -16,6 +16,11 @@ svn switch https://[email protected]/repo/branches/feature-do-awesome-thing
    svn rm https://[email protected]/repo/branches/feature-do-awesome-thing \
    -m "Removed branch feature-do-awesome-thing for xxx purpose."

    # restore deleted branch
    svn copy http://somedomain.com/repo/branches/feature-do-awesome-thing@123 \
    http://somedomain.com/repo//branches/feature-do-awesome-thing \
    -m "Restore deleted branch feature-do-awesome-thing."

    # merge a branch
    svn merge https://[email protected]/repo/trunk

  2. Hendra Uzia revised this gist Mar 24, 2013. 1 changed file with 11 additions and 1 deletion.
    12 changes: 11 additions & 1 deletion svn_workflow.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -14,4 +14,14 @@ svn switch https://[email protected]/repo/branches/feature-do-awesome-thing

    # delete a branch
    svn rm https://[email protected]/repo/branches/feature-do-awesome-thing \
    -m "Removed branch feature-do-awesome-thing for xxx purpose."
    -m "Removed branch feature-do-awesome-thing for xxx purpose."

    # merge a branch
    svn merge https://[email protected]/repo/trunk

    # resolve conflict
    svn resolve --resolve (working|theirs-full|mine-full) path/to/file

    # resolve tree conflict
    # e.g.: local add, incoming add upon merge
    svn resolve --resolve working -R .
  3. Hendra Uzia revised this gist Mar 24, 2013. 1 changed file with 5 additions and 1 deletion.
    6 changes: 5 additions & 1 deletion svn_workflow.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -10,4 +10,8 @@ svn copy http://somedomain.com/repo/trunk \
    svn switch ^/repo/branches/feature-do-awesome-thing

    # in beanstalk you have to type the whole address, in that case:
    svn switch https://[email protected]/repo/branches/feature-do-awesome-thing
    svn switch https://[email protected]/repo/branches/feature-do-awesome-thing

    # delete a branch
    svn rm https://[email protected]/repo/branches/feature-do-awesome-thing \
    -m "Removed branch feature-do-awesome-thing for xxx purpose."
  4. Hendra Uzia revised this gist Mar 9, 2013. 1 changed file with 12 additions and 1 deletion.
    13 changes: 12 additions & 1 deletion svn_workflow.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -1,2 +1,13 @@
    # create working directory from trunk
    svn checkout https://[email protected]/repo/trunk
    svn checkout http://somedomain.com/repo/trunk

    # create a branch
    svn copy http://somedomain.com/repo/trunk \
    http://somedomain.com/repo//branches/feature-do-awesome-thing \
    -m "Created branch to implement feature do awesome thing."

    # switch working copy
    svn switch ^/repo/branches/feature-do-awesome-thing

    # in beanstalk you have to type the whole address, in that case:
    svn switch https://[email protected]/repo/branches/feature-do-awesome-thing
  5. Hendra Uzia renamed this gist Mar 9, 2013. 1 changed file with 1 addition and 0 deletions.
    1 change: 1 addition & 0 deletions svn_workflow → svn_workflow.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -1 +1,2 @@
    # create working directory from trunk
    svn checkout https://[email protected]/repo/trunk
  6. Hendra Uzia created this gist Mar 9, 2013.
    1 change: 1 addition & 0 deletions svn_workflow
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1 @@
    svn checkout https://[email protected]/repo/trunk