dev@glassfish.java.net

Re: svn commit: r41383 - trunk/v3: . common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl orb/orb-iiop/src/main/java/org/glassfish/ente...

From: Snjezana Sevo-Zenzerovic <snjezana.sevozenzerovic_at_oracle.com>
Date: Tue, 05 Oct 2010 13:38:36 -0700

Scratch that answer, since you already committed those changes... Yes,
svn will in this case "revert" your workspace to current state and
you'll have to explicitly go back to previous revision to get your
changes back...

Snjezana Sevo-Zenzerovic wrote:
> No, svn will attempt to merge and report conflicts if any...
>
> Ken wrote:
>> Jane Young wrote:
>>> I've reverted Ken's commit (svn r41383). Hudson job is now back to
>>> normal.
>>> Marina, please update your workspace and build should be fine.
>>>
>>> Jane
>>>
>> What happens in svn if I do an svn update after the revert into the
>> workspace from which I did the commit? Does svn remove/overwrite my
>> 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
>
>


-- 
Oracle <http://www.oracle.com>
Snjezana Sevo-Zenzerovic
Green Oracle <http://www.oracle.com/commitment> Oracle is committed to 
developing practices and products that help protect the environment