Re: Subversion and RPG source change management

It's quite probable that commit conflict resolution would have to be

performed asynchronously, anyway; perhaps phone contact with the other
programmer who committed his changes first; source compare; source merge;
resolve differences.

I think this is where a "check out" system coupled with a nightly mass
commit from SEU to SVN would be perfect. By checking out a source member
you lock others from modifying the same one until you check it back in. And
since there is only one person modifying it you shouldn't ever need merges -
or at least it would be rare.

Aaron Bartell
http://mowyourlawn.com
http://mowyourlawn.com/blog/


On Fri, May 28, 2010 at 11:48 AM, Nathan Andelin <nandelin@xxxxxxxxx> wrote:

From: Mark Murphy
Unfortunately the Commit can fail if there are conflicts, and needs to be
watched.

That's true, but I don't have a problem with it. It's quite probable that
commit conflict resolution would have to be performed asynchronously,
anyway; perhaps phone contact with the other programmer who committed his
changes first; source compare; source merge; resolve differences.

If a nightly commit fails, just send the programmer an SMS or email
message, and add a record to a history table.

-Nathan.