[UPHPU] Source Code Control Options

[Roberto Mello]

On Mon, Mar 10, 2008 at 10:34 AM, Alvaro Carrasco <alvaro at epliant.com> wrote:
>
>  It is true that it lacks merge tracking, but you can use the svnmerge.py
>  tool to track merges for you. It works great.

Yes, and I use svnmerge.py. It's pretty much the only sane way I know
of to use branches with subversion.

But it is subpar, and there are problems, and caveats, and you have to
be careful, and someone has to be left with the chore of merging
things.

In other words it's a pain, just a lesser pain than if svnmerge.py
didn't exist. Such pain does not exist with distributed VCSs.

Roberto