Hi Alexey,
Thank you for your guide!
At the moment, I felt like I was in hell. :)
Thanks.
Regards,
Bongjae Chang
2011. 12. 3. ���� 1:34 Oleksiy Stashok <oleksiy.stashok_at_oracle.com> �ۼ�:
> Hi,
>
> don't worry Bongjae, same happened to me when I just started w/ git.
> Next time, when you pull out the changes on trunk use:
>
> git pull --rebase origin master
>
>
> Thanks.
>
> WBR,
> Alexey.
>
> On 12/02/2011 04:12 PM, Bongjae Chang wrote:
>>
>> Hi,
>>
>> It seems that files which I didn't intended in rev. 116f294c9ad0c0d4ea963cb6965404838d938f4d were already committed-files today.
>>
>> Here are the list.
>>
>> 1.
>> Project: grizzly
>> Repository: git
>> Revision: 460b6895a269a7ad3f1bd3f0fc10f342dd33db98
>> Author: oleksiys
>> Date: 2011-12-02 12:14:47 UTC
>> Link:
>>
>> Log Message:
>> ------------
>> + fix issue #1139
>> http://java.net/jira/browse/GRIZZLY-1139
>> "Make possible for org.glassfish.grizzly.utils.Charsets to preload all the available charsets"
>>
>> Revisions:
>> ----------
>> 460b6895a269a7ad3f1bd3f0fc10f342dd33db98
>>
>> 2.
>> Project: grizzly
>> Repository: git
>> Revision: e3fec22be6c05fb204295a606bb492fc57196fa4
>> Author: oleksiys
>> Date: 2011-12-02 11:28:26 UTC
>> Link:
>>
>> Log Message:
>> ------------
>> fix copyright header
>>
>> Revisions:
>> ----------
>> e3fec22be6c05fb204295a606bb492fc57196fa4
>>
>> 3.
>> Project: grizzly
>> Repository: git
>> Revision: e20e2fef51bf2b26aeedf5d6923012a3cb7106cb
>> Author: oleksiys
>> Date: 2011-12-02 11:11:03 UTC
>> Link:
>>
>> Log Message:
>> ------------
>> + fix issue #1138
>> http://java.net/jira/browse/GRIZZLY-1138
>> "Separate DEFAULT_CHARSET and DEFAULT_HTTP_CHARSET"
>>
>> Revisions:
>> ----------
>> e20e2fef51bf2b26aeedf5d6923012a3cb7106cb
>>
>> 4.
>> Project: grizzly
>> Repository: git
>> Revision: 2b2563636fe4024fda94656493126b6ffdc8f02a
>> Author: rlubke
>> Date: 2011-12-02 03:49:55 UTC
>> Link:
>>
>> Log Message:
>> ------------
>> First pass at WS changes necessary for Grizzly-based AHC WebSocket client.
>>
>> Revisions:
>> ----------
>> 2b2563636fe4024fda94656493126b6ffdc8f02a
>>
>>
>>
>> It also seems that these files were not committed by me and files' commit logs hadn't changed a bit now.
>>
>> So, it looks harmless, right?
>>
>> I am sorry that I am not familiar to Git. :(
>>
>> Thanks.
>>
>> Regards,
>> Bongjae Chang
>>
>>
>> From: Bongjae Chang <bongjae.chang_at_gmail.com>
>> Date: Fri, 02 Dec 2011 22:41:20 +0900
>> To: "dev_at_grizzly.java.net" <dev_at_grizzly.java.net>
>> Subject: wrong commit rev.116f294c9ad0c0d4ea963cb6965404838d938f4d.
>>
>> Hi Alexey,
>>
>> I am very sorry for committing wrong files.
>>
>> I just commited Rev. 116f294c9ad0c0d4ea963cb6965404838d938f4d.
>>
>> But, the following files was not intended.
>>
>> ---
>> extras/http-server-multipart/src/test/java/org/glassfish/grizzly/http/multipart/utils/MultipartPacketBuilder.java
>> extras/http-servlet-extras/src/test/java/org/glassfish/grizzly/servlet/util/MultipartPacketBuilder.java
>> modules/grizzly/src/main/java/org/glassfish/grizzly/utils/Charsets.java
>> modules/grizzly/src/test/java/org/glassfish/grizzly/CharsetsTest.java
>> modules/http-ajp/src/main/java/org/glassfish/grizzly/http/ajp/AjpHttpRequest.java
>> modules/http-server/src/main/java/org/glassfish/grizzly/http/server/Constants.java
>> modules/http-server/src/main/java/org/glassfish/grizzly/http/server/Request.java
>> modules/http-server/src/main/java/org/glassfish/grizzly/http/server/Response.java
>> modules/http-server/src/main/java/org/glassfish/grizzly/http/server/io/InputBuffer.java
>> modules/http-server/src/main/java/org/glassfish/grizzly/http/server/io/OutputBuffer.java
>> modules/http-server/src/main/java/org/glassfish/grizzly/http/server/util/Mapper.java
>> modules/http-servlet/src/main/java/org/glassfish/grizzly/servlet/DispatchedHttpServletRequest.java
>> modules/http/src/main/java/org/glassfish/grizzly/http/HttpHeader.java
>> modules/http/src/main/java/org/glassfish/grizzly/http/util/BufferChunk.java
>> modules/http/src/main/java/org/glassfish/grizzly/http/util/ByteChunk.java
>> modules/http/src/main/java/org/glassfish/grizzly/http/util/Constants.java
>> modules/http/src/main/java/org/glassfish/grizzly/http/util/Parameters.java
>> modules/http/src/test/java/org/glassfish/grizzly/http/core/RequestURITest.java
>> modules/websockets/src/main/java/org/glassfish/grizzly/websockets/HandShake.java
>> modules/websockets/src/main/java/org/glassfish/grizzly/websockets/ProtocolHandler.java
>> modules/websockets/src/main/java/org/glassfish/grizzly/websockets/WebSocketEngine.java
>> modules/websockets/src/main/java/org/glassfish/grizzly/websockets/draft06/Draft06Handler.java
>> modules/websockets/src/main/java/org/glassfish/grizzly/websockets/draft07/Draft07Handler.java
>> modules/websockets/src/main/java/org/glassfish/grizzly/websockets/draft08/Draft08Handler.java
>> --
>>
>> I intended to commit the following.
>> --
>> extras/thrift/src/main/java/org/glassfish/grizzly/thrift/TGrizzlyClientTransport.java
>> extras/thrift/src/main/java/org/glassfish/grizzly/thrift/TGrizzlyServerTransport.java
>> extras/thrift/src/main/java/org/glassfish/grizzly/thrift/ThriftFrameFilter.java
>> extras/thrift/src/main/java/org/glassfish/grizzly/thrift/ThriftServerFilter.java
>> --
>>
>> Could you please rolled back them?
>>
>> Regards,
>> Bongjae Chang
>>
>