8 Sep
2008
8 Sep
'08
3:15 p.m.
Guillaume Lazzara <z(a)lrde.epita.fr> writes:
URL: https://svn.lrde.epita.fr/svn/oln
Git branch: cleanup (HEAD: 9517158)
ChangeLog:
2008-09-05 Guillaume Lazzara <z(a)lrde.epita.fr>
Merge last changes from trunk to cleanup.
* milena/ChangeLog: .
* milena/mln/fun/x2x/rotation.hh: .
* milena/mln/fun/x2x/translation.hh: .
* milena/mln/metal/all.hh: .
* milena/mln/metal/array.hh: New.
* milena/mln/metal/array1d.hh: New.
* milena/mln/metal/array2d.hh: New.
* milena/mln/metal/array3d.hh: New.
* milena/sandbox/ChangeLog: .
* milena/sandbox/geraud/fllt/fllt.svg.7.hh: .
* milena/sandbox/jardonnet/array/Makefile: New.
* milena/sandbox/jardonnet/array/array.cc: .
* milena/sandbox/jardonnet/array/array.hh: .
* milena/sandbox/jardonnet/array/old/1d.hh: .
* milena/sandbox/jardonnet/registration/tools.hh: .
* milena/sandbox/jardonnet/test/icp.cc: .
* milena/sandbox/jardonnet/virtual/Makefile: New.
* milena/sandbox/jardonnet/virtual/access.cc: New.
* milena/sandbox/jardonnet/virtual/access.hh: New.
* milena/sandbox/nivault/plugin-gimp/autogen.sh: .
* milena/sandbox/nivault/plugin-gimp/configure.ac: .
* milena/sandbox/nivault/plugin-gimp/src/main.cc: .
I think a merge from the trunk (the thing that gets distributed
someday) to a development branch (which is not distributed) should
produce no ChangeLog entries.
The converse is false IMHO; see section 5.2.2 of the LRDE Guidelines:
https://www.lrde.epita.fr/dload/guide/guide.html#htoc65
----------------------------------------------------------------------
- Lorsque vous fusionnez une branche, ajoutez une tabulation aux
en-têtes du ChangeLog ajouté, et collez tous ça dans le nouveau
ChangeLog. Voici un exemple :
2003-10-01 Raphael Poss <raph(a)lrde.epita.fr>
Merge the following changes.
2003-10-01 Raphael Poss <raph(a)lrde.epita.fr>
* src/translate/translation.cc: Fix bug where reference to
temporaries were stored in the heap.
2003-09-30 Raphael Poss <raph(a)lrde.epita.fr>
* Synchronize with main project.
[...]
* src/misc/Makefile.am: Mention the new files.
----------------------------------------------------------------------
We should stick to this convention: only notifies ChangeLogs of merges
*when getting back to the trunk*.
Of course, when updating a dev. branch with changes from the trunk,
you can update the ChangeLog as well; just remember not to record
these entries a second time when re-merging back to the trunk!
(I'm fixing these entries this time.)