[asterisk-dev] any easy way to block automerging ?

[Kevin P. Fleming]

Luigi Rizzo wrote:
> I find this svnmerge feature exceedingly annoying:
> 
>     > svnmerge block -r 48566 -P branch-1.4-merged -B branch-1.4-blocked
>     svnmerge: "." has local modifications; it must be clean
> 
> Given that I do need local modifications to build stuff on my
> (non-linux) systems, this means that to run svnmerge i need an extra
> clean copy of the tree.

It wouldn't matter if svnmerge didn't complain about this anyway, as
you'd have to be extra careful during 'svn commit' to avoid committing
your local mods as well. It is much safer this way.