Summary:ASTERISK-16256: [patch] Documentation updates for 'Developer branches and branch merging'
Reporter:Paul Belanger (pabelanger)Labels:
Date Opened:2010-06-17 09:36:48Date Closed:2011-07-26 15:34:05
Versions:Frequency of
Environment:Attachments:( 0) HOWTO:_Branching_and_Merging_Developer_Branches
Description:Currently http://www.asterisk.org/developers/svn-branching-merging is a great resource for new developers / bug marshals to learn about Asterisk and subversion.  However I've found not all information is listed


For example (and not Asterisk specific):

How do I change the log message for a revision after it's been committed?
$ svn propedit -r <revision number> --revprop svn:log

How do I enable interactive-conflicts when using 'svnmerge'?
$ vi ~/.subversion/config
### Set interactive-conflicts to 'no' to disable interactive
### conflict resolution prompting.  It defaults to 'yes'.
interactive-conflicts = no
Comments:By: Leif Madsen (lmadsen) 2010-06-17 13:24:59

Good suggestions. We should flesh this out a bit and find out where we should put them in the page.

By: Paul Belanger (pabelanger) 2010-07-21 15:28:35

How do you revert a previous commit?
$ svn merge -c -<revision> .

By: Leif Madsen (lmadsen) 2010-07-21 21:00:43

Yep, that's the one! :)

By: Paul Belanger (pabelanger) 2010-07-21 21:26:29

:) Sorry, just brain dumping question and answers here, until we update the document.

By: Paul Belanger (pabelanger) 2010-08-03 15:40:57

v1 of the document.  Feel free to edit / delete / add etc.  Some specific stuff I left out was about blocking a merge, not sure when this is done.

Also need to add some info to the FAQ

By: Russell Bryant (russell) 2011-05-05 16:55:34

Should this still be open now that we have some updated info on the wiki?