[asterisk-commits] branch murf/AEL-trunk-fixesonly r31777 - /team/murf/AEL-trunk-fixesonly/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Sat Jun  3 12:32:32 2006
New Revision: 31777

URL: http://svn.digium.com/view/asterisk?rev=31777&view=rev
Log:
Setting up initial props on this branch; automerge, pd's of the 1.2 merged-blocked props,
and the svnmerge init. Uh, the instruction at http://www.asterisk.org/developers/svn-branching-merging
need to be updated. If you do the svn pd's first, then you can't do the svnmerge init; it aborts, saying
that modifications exist, the repo has to be clean.


Modified:
    team/murf/AEL-trunk-fixesonly/   (props changed)

Propchange: team/murf/AEL-trunk-fixesonly/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/murf/AEL-trunk-fixesonly/
            ('branch-1.2-blocked' removed)

Propchange: team/murf/AEL-trunk-fixesonly/
            ('branch-1.2-merged' removed)

Propchange: team/murf/AEL-trunk-fixesonly/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-31773