dev@glassfish.java.net

Re: svn commit: r41383 - trunk/v3

From: Marina Vatkina <marina.vatkina_at_oracle.com>
Date: Tue, 05 Oct 2010 14:31:41 -0700

Why would you need to remove ORB from ~/.m2/repository? Can there be a
conflict with the versions?

thanks,
-marina

Ken wrote:
> Jane Young wrote:
>> Yes... like Byron pointed out, you can revert my commit locally and
>> get your changes back in your workspace after you do a "svn update".
>> To do that you use the "svn merge" command.
>>
> I looked at the svn merge command, but I don't understand this (svn is
> not my favorite SCM system).
> What svn merge command do I need to get the changes from 41383 into my
> working copy which is currently
> at rev 41398, so that I can fix whatever broke the build (which OF
> COURSE built perfectly for me
> after deleting the ORB from ~/.m2/repository, mvn clean, mvn -U
> install: what ELSE can I do to make
> sure this doesn't happen?) into a form where a svn commit commit the
> correct changes?
>
> Thanks,
>
> Ken.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>