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: Jane Young <jane.young_at_oracle.com>
Date: Tue, 05 Oct 2010 13:52:25 -0700

  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.





On 10/5/10 1:47 PM, Byron Nevins wrote:
> There is no such thing as a revert or a rollback in SVN. Jane simply
> checked in changed files that happen to exactly match rev 41382.
>
> If you do 'svn update', and if you didn't change anything after
> committing 41383, then it will update all the files to the new version
> (which are the files BEFORE your commit).
>
> You can always get back the files you committed since they were not
> really reverted. They are in there forever as rev 41382
>
>
>
> On 10/5/2010 1:33 PM, 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
>
> --
> Byron Nevins - Oracle Corporation
> Home: 650-359-1290
> Cell: 650-784-4123
> Sierra: 209-295-2188
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net For
> additional commands, e-mail: dev-help_at_glassfish.dev.java.net