ESS 12.04 --- VERSION / ess-custom.el <-> ess-revision still brittle

[Sparapani, Rodney]

> For SVN users: assume X committed his ess-custom.el, and Y (having his
> own change in ess-custom.el) is updating. Then Y will get an unmerged
> conflict, right?
>
> Vitalie.

Hi Vitalie:

Well, as you know, there are all kinds of conflicts.  For example, suppose
I try to commit, but I have forgotten to do an 'svn update' beforehand
(which happens occasionally).  So, I really don't see this is all that
much different.  Just to be clear (Martin please correct me if I'm wrong):

Step 0. make clean; svn update
Step 1. edit ESS and test the bug-fix/feature
Step 2. make # build ESS to test your changes globally
Step 3. optional, for edits in ess-custom.el only: revert changes due to Step 2
Step 4. svn commit # edited files and ChangeLog

Now, if somebody has a better solution WITH SVN, then please speak up.
Are there any examples in the GNU Emacs world (XEmacs uses Mercurial
so they are of no help: also XEmacs has both an upstream version
and a downstream version which causes some confusion)?

Otherwise, it seems like a reasonable method which may require some
tinkering in the future.  After this release, we'll have 4 more months to
work on it.

Rodney

PS. Don't forget to enjoy the holidays!