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

[Vitalie Spinu]

>>>> Martin Maechler <maechler at stat.math.ethz.ch>
>>>> on Fri, 6 Apr 2012 02:20:59 +0200 wrote:

  > HOWEVER, if you remove the *.elc and then build from the
  > tarball, then 'svn up' is tried to be used for building VERSION
  > and  lisp/ess-custom.el
  > and it does destroy the correct ess-revision and replace it by a
  > pseudo one ("12.04-rexported") for me.

I've realized only now what the change was about. Make is now messing
with ess-custom.el. This could not be right. I cannot use git properly
anymore, as gitsvn would not allow me to fetch new revisions unless I
have all my changes stashed or committed. So each time, after make, and
before fetching I have to do "git reset HEAD --hard" to undo the make
change.

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.