Re: [Crystal-develop] Merge trunk commit

[Alexandru V. <voi...@gm...>]

Also the merge had some problems in the hair branch, as some files weren't
updated to the latest revision: bullet.h and bullet.cpp seem to have skipped
r34580 (I have just seen this). For these files there were some conflicts
that I resolved 'using theirs', so they should have been updated properly.

Alex.

On Wed, Jul 28, 2010 at 4:27 PM, Christian Van Brussel <
chr...@uc...> wrote:

> Those changes have effectively been commited to trunk.
>
> I don't know what could have happened, these changes are a partial
> reverse of r34577 so I don't understand.
>
> I can simply put back the changes reverted but I'm not sure this won't
> be problematic for future merging.
>
> Has anyone else an idea of what could have happened and how to fix this?
>
>
>
> On Tue, 2010-07-27 at 16:51 +0300, Alexandru Voicu wrote:
> > Hello,
> >
> > After merging the hair branch with the trunk via: 'python svnmerge.py
> > merge -S /CS/trunk r1-34587' and committing, it appears that there
> > were some files modified in the trunk as well.
> > When I diff between r34595 and r34594 I get:
> >
> > https://crystal.svn.sourceforge.net/svnroot/crystal/CS/trunk
> >
> > data/bias/models/iceblocks/factories/gibs    Deleted
> > data/bias/models/iceblocks/factories/gengibs    Added
> > data/bias/models/iceblocks...\skelArmature.001    Modified
> > data/bias/models/iceblocks/gibs    Modified
> >
> >
> > I haven't committed anything on the trunk branch though, and I am not
> > sure if my user even has permission to do that.
> > However if the modification occurred should I revert to r34594 and
> > commit (if it works)?
> >
> > Alex.
> >
> >
> ------------------------------------------------------------------------------
> > The Palm PDK Hot Apps Program offers developers who use the
> > Plug-In Development Kit to bring their C/C++ apps to Palm for a share
> > of $1 Million in cash or HP Products. Visit us here for more details:
> > http://ad.doubleclick.net/clk;226879339;13503038;l?
> > http://clk.atdmt.com/CRS/go/247765532/direct/01/
> > _______________________________________________
> > Crystal-develop mailing list
> > Cry...@li...
> > https://lists.sourceforge.net/lists/listinfo/crystal-develop
>
>
>
>
> ------------------------------------------------------------------------------
> The Palm PDK Hot Apps Program offers developers who use the
> Plug-In Development Kit to bring their C/C++ apps to Palm for a share
> of $1 Million in cash or HP Products. Visit us here for more details:
> http://p.sf.net/sfu/dev2dev-palm
> _______________________________________________
> Crystal-develop mailing list
> Cry...@li...
> https://lists.sourceforge.net/lists/listinfo/crystal-develop
>