[Gimp-web] Status of the new web site

Simon Budig Simon.Budig at unix-ag.org
Tue Sep 23 18:24:11 2003


Raphaël Quinet (quinet@gamers.org) wrote:
> Oops!  I see that someone has already changed the text of that page,
> removed my text and added a link to ftgimp.com... without adding a
> ChangeLog entry simultaneously!  Shame on the culprit!  I will hunt
> down and torture him/her!  As Yosh said some time ago for the GIMP
> code, any commit should have a ChangeLog entry committed at the same
> time, otherwise the changes will be backed out.
> 
> (A few seconds later...)  Ah well, "cvs log" showed me the name of the
> culprit.  Hmmm...  I'll let it pass for once.  ;-)  But please, when
> you commit something, make sure that you update and commit the
> ChangeLog at the same time.

While this generally is true - ChangeLog entries are important -
the lack of one must not result in overwriting the data. This only
will lead to frustrations because of duplicated effort.

There is a useful mechanism that is called CVS. Everybody who
commits stuff usually gets a notice when a local modified copy
is not on the same version level as the file on the server.
It then is up to the committer to cvs update and resolve eventual
conflicts.

Simply reverting the change and overwriting it with your own
changes is the worst idea, because it *will* piss off people, who
might not really be aware that you implicitely apply the rules of the
Gimp core project to the mmmaybe team (mostly people who have never
committed anything to GIMP-HEAD!).


I admit, i am a lurker in the gimp-web effort and I cannot really
say anything about the conventions used. But since this apparently
has not yet been discussed on this list I thought I'd step in and
try to pad off places where a conflicts and frustrations might rise.

Bye,
        Simon
-- 
      Simon.Budig@unix-ag.org       http://www.home.unix-ag.org/simon/