Re: [Swig-devel] SWIG 3

[Vadim Z. <vz...@ze...>]

On Mon, 9 Sep 2013 16:49:21 +0400 Vladimir Kalinin <vka...@op...> wrote:

VK> I'm not quite familiar with the merging process -
VK> do you mean I have to merge (fast-forward) changes from
VK> https://github.com/swig/swig 'master' branch to my 'master' branch at
VK> https://github.com/wkalinin/swig for it to be ready for merge to trunk?

 Hello Vladimir,

 You can't fast forward your branch as it has diverged from master since
then, so it needs to be either rebased on master or merged with it.

 Personally I think it would be nice to rebase it because the current
history is a bit weird (e.g. it starts with 2 identical commits: 2f97ad9
and c0084fd somehow; and it also contains some strange self-merges like
c1e2a87 and b6c69c8) but I don't know if SWIG has any rules about this.

 What is certain is that currently merging swig/master into wkalinin/swig
doesn't work automatically, there are conflicts in Source/Modules/csharp.cxx
Looking at them again now, they seem less serious than when I saw them the
first time, it looks like we just should combine all changes to the
directors, both the improved smart pointer support done in master and the
nested classes support from your branch. But there could be some ordering
issues that I'm not aware of here, so it would be still better if you could
look at the merge yourself.

 TIA,
VZ