[Dune-devel] [Dune-Commit] [branch] dune-common - 'releases/2.4' updated

[Carsten Gräser]

Dear Robert,
it seems that you cherry-picked your changes in master to
releases/2.4. If you do so please remember to always use
the -x flag of git cherry-pick. Then git will add a line
(cherry-picked from ...) in a default format.

This allows matching original and cherry-picked commits
automatically which makes it much easier to track what
was picked. Without this I have to compare commit messages
and keep a list of those commits manually.

Furthermore please be careful when cherry-picking on your own.
There may be (and in fact there are) other pending cherry-pick
requests for commits in dune-common that happened before your
changes. They even touch the same files. Now we will have those
commits in reverse order in the release branch.

At best just add the [release] tag to all commits that should
be cherry-picked and I'll take care about the rest.

Best,
Carsten







Am 01.07.2015 um 11:45 schrieb Robert Klöfkorn:
> Robert Klöfkorn <robertk at dune-project.org> updated branch 'releases/2.4' (b3d8b8f -> 5704c3d)
> at Wed Jul  1 11:45:15 2015 +0200
> 
> Browsable log: http://cgit.dune-project.org/repositories/dune-common/log/?h=releases/2.4&qt=range&q=b3d8b8f86749857fa6dfbd80fbbe58b3ca850465..5704c3dd5ddf7038663ae1f96935b1f590e8c917
> Complete diff: http://cgit.dune-project.org/repositories/dune-common/diff/?id=5704c3dd5ddf7038663ae1f96935b1f590e8c917&id2=b3d8b8f86749857fa6dfbd80fbbe58b3ca850465
> 
> ======================================================================
> 
> via      15057f0 http://cgit.dune-project.org/repositories/dune-common/commit/?id=15057f0af4f2379cdaeef9ed0ef80c26339950db
>              [Cmake][feature] allow overloading of compiler flags on the command line via a compiler
>              script. This feature is disabled by default and can be enabled by
>              -DALLOW_CXXFLAGS_OVERWRITE=ON.
> via      b7fefc7 http://cgit.dune-project.org/repositories/dune-common/commit/?id=b7fefc74a798668076bfd5caad50ec0d1f2b14b9
>              [Cmake][cleanup] check for necessary unix commands and throw error if not found.
> via      d7b5490 http://cgit.dune-project.org/repositories/dune-common/commit/?id=d7b54905cc46d9e51f5670f4859502cfa91848a5
>              [Cmake][bugfix] Allow to disable latex. Default behavior is the same as before.
> via      5704c3d http://cgit.dune-project.org/repositories/dune-common/commit/?id=5704c3dd5ddf7038663ae1f96935b1f590e8c917
>              add new file to list.
> 
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <https://lists.dune-project.org/pipermail/dune-devel/attachments/20150701/fc7b2c49/attachment.sig>