tag:www.nabble.com,2006:forum-10898Nabble - SVNKit2008-09-06T04:44:46ZSVNKit is a pure Java Subversion client library. SVNKit home is <a href="http://svnkit.com/" target="_top" rel="nofollow">here</a>. SVNKit was formerly known as JavaSVN.tag:www.nabble.com,2006:post-19345787Re: .svn/entries encoding/ decoding2008-09-06T04:44:46Z2008-09-06T04:44:46ZNormen Müller-3He Semyon,
<br><br> I couldn't stand ;-) I ran the script on my PPC PowerBook G4:
<br><br><br>------------------------------------------------------
<br>$ ./add_decomposed.sh
<br>using svn
<br><br>svn checkout
<br>Checked out revision 0.
<br>svn: warning: '/tmp/decomposed_chars/wc/filé' not found
<br>A /tmp/decomposed_chars/wc/dir
<br>A /tmp/decomposed_chars/wc/dir/file?\204?\129
<br><br>svn status -v
<br> 0 0 ? /tmp/decomposed_chars/wc
<br>? /tmp/decomposed_chars/wc/file?\204?\129
<br>A 0 ? ? /tmp/decomposed_chars/wc/dir
<br>A 0 ? ? /tmp/decomposed_chars/wc/dir/file?\204?\129
<br><br>svn commit
<br>Adding tmp/decomposed_chars/wc/dir
<br>Adding tmp/decomposed_chars/wc/dir/file?\204?\129
<br>Transmitting file data .
<br>Committed revision 1.
<br><br>svn status -v
<br> 0 0 ? /tmp/decomposed_chars/wc
<br>? /tmp/decomposed_chars/wc/file?\204?\129
<br> 1 1 nmueller /tmp/decomposed_chars/wc/dir
<br> 1 1 nmueller /tmp/decomposed_chars/wc/dir/file?\204?\129
<br>------------------------------------------------------
<br>$ ./add_decomposed.sh jsvn
<br>using jsvn
<br><br>svn checkout
<br>Checked out revision 0.
<br>A tmp/decomposed_chars/wc/fil?
<br>A tmp/decomposed_chars/wc/dir
<br>A tmp/decomposed_chars/wc/dir/fil?
<br><br>svn status -v
<br> 0 0 ? tmp/decomposed_chars/wc
<br>A 0 ? ? tmp/decomposed_chars/wc/fil?
<br>A 0 ? ? tmp/decomposed_chars/wc/dir
<br>A 0 ? ? tmp/decomposed_chars/wc/dir/fil?
<br><br>svn commit
<br>Adding tmp/decomposed_chars/wc/dir
<br>Adding tmp/decomposed_chars/wc/dir/fil?
<br>Adding tmp/decomposed_chars/wc/fil?
<br>Transmitting file data ..
<br>Committed revision 1.
<br><br>svn status -v
<br> 0 0 ? tmp/decomposed_chars/wc
<br> 1 1 nmueller tmp/decomposed_chars/wc/fil?
<br> 1 1 nmueller tmp/decomposed_chars/wc/dir
<br> 1 1 nmueller tmp/decomposed_chars/wc/dir/fil?
<br>------------------------------------------------------
<br><br>How can I help more?
<br><br>Cheers,
<br> /nm
<br><br>Semyon Vadishev wrote:
<div class='shrinkable-quote'><br>> Hello Normen,
<br>>
<br>> Recently I've been working on an issue which probably is related to the
<br>> problem you described, the attached script demonstrates the matter
<br>> <a href="http://www.nabble.com/file/p19338295/add_decomposed.sh" target="_top">http://www.nabble.com/file/p19338295/add_decomposed.sh</a> add_decomposed.sh
<br>> Please define variables SVN_HOME and JSVN_HOME so you can run
<br>> ./add_decomposed jsvn (or ./add_decomposed svn).
<br>>
<br>> As you can see the problem of native svn cli is that it reads file names
<br>> from the terminal incorrectly - after running `svn add filé` .svn/entries
<br>> file contains incorrect name of the file, so `svn status` output looks
<br>> weird.
<br>>
<br>> As for me`jsvn status` works fine except for one thing -- extended character
<br>> is not printable. Can you please check the output of script and send it back
<br>> to us.
<br>>
<br>>
<br>> Normen Müller-3 wrote:
<br>>> An another information to this thread:
<br>>>
<br>>> StringEscapeUtils.escapeJava() returns 'Mu\u0308ller.txt' for the file
<br>>> name read from .svn/entries. However, this function returns
<br>>> 'M\u00FCller.txt' for the file name read from disk.
<br>>>
<br>>> That's all very weired....
<br>>>
<br>>>
<br>>> Normen Müller wrote:
<br>>>> One more output
<br>>>>
<br>>>> $ svn info -R
<br>>>> Path: Mu?\204?\136ller.txt
<br>>>> Name: Mu?\204?\136ller.txt
<br>>>> URL:
<br>>>> <a href="https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt</a>
<br>>>>
<br>>>> Repository Root: <a href="https://svn.kwarc.info/repos/sandbox" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox</a><br>>>> Revision: 1948
<br>>>> Node Kind: file
<br>>>> Schedule: normal
<br>>>> Last Changed Rev: 1948
<br>>>> Last Changed Date: 2008-08-15 18:09:47 +0200 (Fri, 15 Aug 2008)
<br>>>> Text Last Updated: 2008-08-15 18:07:33 +0200 (Fri, 15 Aug 2008)
<br>>>> Checksum: d41d8cd98f00b204e9800998ecf8427e
<br>>>>
<br>>>> $ jsvn info -R
<br>>>> Path: Mu?ller.txt
<br>>>> Name: Mu?ller.txt
<br>>>> URL:
<br>>>> <a href="https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt</a>
<br>>>>
<br>>>> Repository Root: <a href="https://svn.kwarc.info/repos/sandbox" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox</a><br>>>> Revision: 1948
<br>>>> Node Kind: file
<br>>>> Schedule: normal
<br>>>> Last Changed Rev: 1948
<br>>>> Last Changed Date: 2008-08-15 18:09:47 +0200 (Fri, 15 Aug 2008)
<br>>>> Text Last Updated: 2008-08-15 18:07:33 +0200 (Fri, 15 Aug 2008)
<br>>>> Checksum: d41d8cd98f00b204e9800998ecf8427e
<br>>>>
<br>>>>
<br>>>> Normen Müller wrote:
<br>>>>> Alexander Kitaev wrote:
<br>>>>>> Hello,
<br>>>>>>
<br>>>>>>> org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14#writeString
<br>>>>>> This method escapes ASCII control characters, not all non-ASCII
<br>>>>>> characters. Does entries file created by SVNKit differs from those
<br>>>>>> created by native Subversion client? If so, could you please send both?
<br>>>>> Hmm, that's all a bit weired. Look at the following SVN commands/
<br>>>>> output
<br>>>>>
<br>>>>> $ svn st
<br>>>>> ? Mu?\204?\136ller.txt
<br>>>>>
<br>>>>> $ svn add *
<br>>>>> svn: warning: 'Müller.txt' not found
<br>>>>>
<br>>>>> And now with JSVN:
<br>>>>>
<br>>>>> $ jsvn add *
<br>>>>> A Mu?ller.txt
<br>>>>>
<br>>>>> the .svn/entries file look like this
<br>>>>>
<br>>>>> [snippet]
<br>>>>> Müller.txt
<br>>>>> file
<br>>>>> 1948
<br>>>>> <a href="https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt</a>
<br>>>>>
<br>>>>>
<br>>>>> However 'jsvn info' didn't work
<br>>>>>
<br>>>>> $ jsvn info Müller.txt
<br>>>>> M?ller.txt: (Not a versioned resource)
<br>>>>>
<br>>>>> What am I doing/ understanding wrong?
<br>>>>>
<br>>>>> BTW: Next Monday I will test these issues on a linux box.
<br>>>>>> Alexander Kitaev,
<br>>>>>> TMate Software,
<br>>>>>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>>>>>
<br>>>>>> Normen Müller wrote:
<br>>>>>>> Alexander Kitaev wrote:
<br>>>>>>>> Hello Normen,
<br>>>>>>>>
<br>>>>>>>> entries file is stored in UTF-8 encoding. I think that \x or \u
<br>>>>>>>> escaping depends on the viewer program you're using, not on the
<br>>>>>>>> contents of the entries file (for non-ASCII characters there
<br>>>>>>>> should be several bytes stored in entries file without escaping).
<br>>>>>>> Actually I didn't use a specific viewer, but looked at
<br>>>>>>>
<br>>>>>>> org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14#writeString
<br>>>>>>>
<br>>>>>>> and in this method you explicitly encode, for example, 'Müller' to
<br>>>>>>> 'M\xFCller'. I wanted to use
<br>>>>>>> 'org.apache.commons.lang.StringEscapeUtils.escapeJava' but this
<br>>>>>>> method encodes 'Müller' to 'M\u00FCller'. Is that the reason you
<br>>>>>>> wrote your own encoding/ decoding methods? Cause if would write
<br>>>>>>> the output of StringEscapeUtils to .svn/entries your decoding will
<br>>>>>>> break, right?
<br>>>>>>>> Also, on OSX JVM reports accented characters in file names as
<br>>>>>>>> two-character sequence, this sequence is replaced with single
<br>>>>>>>> accented character code (see SVNFileUtil.compose(...) method).
<br>>>>>>> You mean 'SVNFileListUtil#compose'?
<br>>>>>>>
<br>>>>>>> Now I am a bit confused :-\ May I write 'M\u00FCller' to
<br>>>>>>> .svn/entries or not?
<br>>>>>>>
<br>>>>>>> Cheers,
<br>>>>>>> /nm
<br>>>>>>>> Alexander Kitaev,
<br>>>>>>>> TMate Software,
<br>>>>>>>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>>>>>>>
<br>>>>>>>> Normen Müller wrote:
<br>>>>>>>>> He,
<br>>>>>>>>>
<br>>>>>>>>> I wounder what encoding SVN requires? I am not sure, but it
<br>>>>>>>>> looks like 'Müller' encodes to 'M\xFCller' rather than
<br>>>>>>>>> 'M\u00FCller' what I have expected.
<br>>>>>>>>>
<br>>>>>>>>> Can anyone explain?
<br>>>>>>>>>
<br>>>>>>>>> Cheers,
<br>>>>>>>>> /nm
<br>>>>>>>>>
<br>>>>>>>>>
<br>>>>>>>>> ---------------------------------------------------------------------
<br>>>>>>>>>
<br>>>>>>>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=0" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>>>>>>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=1" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>>>>>>>
<br>>>>>>>>>
<br>>>>>>>> ---------------------------------------------------------------------
<br>>>>>>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=2" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>>>>>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=3" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>>>>>>
<br>>>>>>>
<br>>>>>>> ---------------------------------------------------------------------
<br>>>>>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=4" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>>>>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=5" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>>>>>
<br>>>>>> ---------------------------------------------------------------------
<br>>>>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=6" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>>>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=7" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>>>>
<br>>>>
<br>>>
<br>>>
<br>>> ---------------------------------------------------------------------
<br>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=8" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=9" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>
<br>>>
<br>>>
<br>>
</div><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=10" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345787&i=11" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19345144Re: .svn/entries encoding/ decoding2008-09-06T03:25:01Z2008-09-06T03:25:01ZNormen Müller-3He Semyon,
<br><br> currently I am still on vacation, but I will be back next Wednesday night. I have tagged your e-mail as ``important'', so I will be back to you next Friday by latest.
<br><br>Thanks for your help in advance!
<br><br>Cheers,
<br> /nm
<br><br>Semyon Vadishev wrote:
<div class='shrinkable-quote'><br>> Hello Normen,
<br>>
<br>> Recently I've been working on an issue which probably is related to the
<br>> problem you described, the attached script demonstrates the matter
<br>> <a href="http://www.nabble.com/file/p19338295/add_decomposed.sh" target="_top">http://www.nabble.com/file/p19338295/add_decomposed.sh</a> add_decomposed.sh
<br>> Please define variables SVN_HOME and JSVN_HOME so you can run
<br>> ./add_decomposed jsvn (or ./add_decomposed svn).
<br>>
<br>> As you can see the problem of native svn cli is that it reads file names
<br>> from the terminal incorrectly - after running `svn add filé` .svn/entries
<br>> file contains incorrect name of the file, so `svn status` output looks
<br>> weird.
<br>>
<br>> As for me`jsvn status` works fine except for one thing -- extended character
<br>> is not printable. Can you please check the output of script and send it back
<br>> to us.
<br>>
<br>>
<br>> Normen Müller-3 wrote:
<br>>> An another information to this thread:
<br>>>
<br>>> StringEscapeUtils.escapeJava() returns 'Mu\u0308ller.txt' for the file
<br>>> name read from .svn/entries. However, this function returns
<br>>> 'M\u00FCller.txt' for the file name read from disk.
<br>>>
<br>>> That's all very weired....
<br>>>
<br>>>
<br>>> Normen Müller wrote:
<br>>>> One more output
<br>>>>
<br>>>> $ svn info -R
<br>>>> Path: Mu?\204?\136ller.txt
<br>>>> Name: Mu?\204?\136ller.txt
<br>>>> URL:
<br>>>> <a href="https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt</a>
<br>>>>
<br>>>> Repository Root: <a href="https://svn.kwarc.info/repos/sandbox" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox</a><br>>>> Revision: 1948
<br>>>> Node Kind: file
<br>>>> Schedule: normal
<br>>>> Last Changed Rev: 1948
<br>>>> Last Changed Date: 2008-08-15 18:09:47 +0200 (Fri, 15 Aug 2008)
<br>>>> Text Last Updated: 2008-08-15 18:07:33 +0200 (Fri, 15 Aug 2008)
<br>>>> Checksum: d41d8cd98f00b204e9800998ecf8427e
<br>>>>
<br>>>> $ jsvn info -R
<br>>>> Path: Mu?ller.txt
<br>>>> Name: Mu?ller.txt
<br>>>> URL:
<br>>>> <a href="https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt</a>
<br>>>>
<br>>>> Repository Root: <a href="https://svn.kwarc.info/repos/sandbox" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox</a><br>>>> Revision: 1948
<br>>>> Node Kind: file
<br>>>> Schedule: normal
<br>>>> Last Changed Rev: 1948
<br>>>> Last Changed Date: 2008-08-15 18:09:47 +0200 (Fri, 15 Aug 2008)
<br>>>> Text Last Updated: 2008-08-15 18:07:33 +0200 (Fri, 15 Aug 2008)
<br>>>> Checksum: d41d8cd98f00b204e9800998ecf8427e
<br>>>>
<br>>>>
<br>>>> Normen Müller wrote:
<br>>>>> Alexander Kitaev wrote:
<br>>>>>> Hello,
<br>>>>>>
<br>>>>>>> org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14#writeString
<br>>>>>> This method escapes ASCII control characters, not all non-ASCII
<br>>>>>> characters. Does entries file created by SVNKit differs from those
<br>>>>>> created by native Subversion client? If so, could you please send both?
<br>>>>> Hmm, that's all a bit weired. Look at the following SVN commands/
<br>>>>> output
<br>>>>>
<br>>>>> $ svn st
<br>>>>> ? Mu?\204?\136ller.txt
<br>>>>>
<br>>>>> $ svn add *
<br>>>>> svn: warning: 'Müller.txt' not found
<br>>>>>
<br>>>>> And now with JSVN:
<br>>>>>
<br>>>>> $ jsvn add *
<br>>>>> A Mu?ller.txt
<br>>>>>
<br>>>>> the .svn/entries file look like this
<br>>>>>
<br>>>>> [snippet]
<br>>>>> Müller.txt
<br>>>>> file
<br>>>>> 1948
<br>>>>> <a href="https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt</a>
<br>>>>>
<br>>>>>
<br>>>>> However 'jsvn info' didn't work
<br>>>>>
<br>>>>> $ jsvn info Müller.txt
<br>>>>> M?ller.txt: (Not a versioned resource)
<br>>>>>
<br>>>>> What am I doing/ understanding wrong?
<br>>>>>
<br>>>>> BTW: Next Monday I will test these issues on a linux box.
<br>>>>>> Alexander Kitaev,
<br>>>>>> TMate Software,
<br>>>>>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>>>>>
<br>>>>>> Normen Müller wrote:
<br>>>>>>> Alexander Kitaev wrote:
<br>>>>>>>> Hello Normen,
<br>>>>>>>>
<br>>>>>>>> entries file is stored in UTF-8 encoding. I think that \x or \u
<br>>>>>>>> escaping depends on the viewer program you're using, not on the
<br>>>>>>>> contents of the entries file (for non-ASCII characters there
<br>>>>>>>> should be several bytes stored in entries file without escaping).
<br>>>>>>> Actually I didn't use a specific viewer, but looked at
<br>>>>>>>
<br>>>>>>> org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14#writeString
<br>>>>>>>
<br>>>>>>> and in this method you explicitly encode, for example, 'Müller' to
<br>>>>>>> 'M\xFCller'. I wanted to use
<br>>>>>>> 'org.apache.commons.lang.StringEscapeUtils.escapeJava' but this
<br>>>>>>> method encodes 'Müller' to 'M\u00FCller'. Is that the reason you
<br>>>>>>> wrote your own encoding/ decoding methods? Cause if would write
<br>>>>>>> the output of StringEscapeUtils to .svn/entries your decoding will
<br>>>>>>> break, right?
<br>>>>>>>> Also, on OSX JVM reports accented characters in file names as
<br>>>>>>>> two-character sequence, this sequence is replaced with single
<br>>>>>>>> accented character code (see SVNFileUtil.compose(...) method).
<br>>>>>>> You mean 'SVNFileListUtil#compose'?
<br>>>>>>>
<br>>>>>>> Now I am a bit confused :-\ May I write 'M\u00FCller' to
<br>>>>>>> .svn/entries or not?
<br>>>>>>>
<br>>>>>>> Cheers,
<br>>>>>>> /nm
<br>>>>>>>> Alexander Kitaev,
<br>>>>>>>> TMate Software,
<br>>>>>>>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>>>>>>>
<br>>>>>>>> Normen Müller wrote:
<br>>>>>>>>> He,
<br>>>>>>>>>
<br>>>>>>>>> I wounder what encoding SVN requires? I am not sure, but it
<br>>>>>>>>> looks like 'Müller' encodes to 'M\xFCller' rather than
<br>>>>>>>>> 'M\u00FCller' what I have expected.
<br>>>>>>>>>
<br>>>>>>>>> Can anyone explain?
<br>>>>>>>>>
<br>>>>>>>>> Cheers,
<br>>>>>>>>> /nm
<br>>>>>>>>>
<br>>>>>>>>>
<br>>>>>>>>> ---------------------------------------------------------------------
<br>>>>>>>>>
<br>>>>>>>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=0" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>>>>>>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=1" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>>>>>>>
<br>>>>>>>>>
<br>>>>>>>> ---------------------------------------------------------------------
<br>>>>>>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=2" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>>>>>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=3" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>>>>>>
<br>>>>>>>
<br>>>>>>> ---------------------------------------------------------------------
<br>>>>>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=4" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>>>>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=5" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>>>>>
<br>>>>>> ---------------------------------------------------------------------
<br>>>>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=6" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>>>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=7" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>>>>
<br>>>>
<br>>>
<br>>>
<br>>> ---------------------------------------------------------------------
<br>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=8" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=9" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>
<br>>>
<br>>>
<br>>
</div><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=10" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19345144&i=11" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19338295Re: .svn/entries encoding/ decoding2008-09-05T12:52:01Z2008-09-05T12:52:01ZSemyon VadishevHello Normen,
<br><br>Recently I've been working on an issue which probably is related to the problem you described, the attached script demonstrates the matter <a href="http://www.nabble.com/file/p19338295/add_decomposed.sh" target="_top">add_decomposed.sh</a><br>Please define variables SVN_HOME and JSVN_HOME so you can run ./add_decomposed jsvn (or ./add_decomposed svn).
<br><br>As you can see the problem of native svn cli is that it reads file names from the terminal incorrectly - after running `svn add filé` .svn/entries file contains incorrect name of the file, so `svn status` output looks weird.
<br><br>As for me`jsvn status` works fine except for one thing -- extended character is not printable. Can you please check the output of script and send it back to us.
<br><br><blockquote class="quote light-black dark-border-color"><div class="quote light-border-color">
<div class="quote-author" style="font-weight: bold;">Normen Müller-3 wrote:</div>
<div class="quote-message shrinkable-quote">An another information to this thread:
<br><br>StringEscapeUtils.escapeJava() returns 'Mu\u0308ller.txt' for the file
<br>name read from .svn/entries. However, this function returns
<br>'M\u00FCller.txt' for the file name read from disk.
<br><br>That's all very weired....
<br><br><br>Normen Müller wrote:
<br>> One more output
<br>>
<br>> $ svn info -R
<br>> Path: Mu?\204?\136ller.txt
<br>> Name: Mu?\204?\136ller.txt
<br>> URL:
<br>> <a href="https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt</a>
<br>>
<br>> Repository Root: <a href="https://svn.kwarc.info/repos/sandbox" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox</a><br>> Revision: 1948
<br>> Node Kind: file
<br>> Schedule: normal
<br>> Last Changed Rev: 1948
<br>> Last Changed Date: 2008-08-15 18:09:47 +0200 (Fri, 15 Aug 2008)
<br>> Text Last Updated: 2008-08-15 18:07:33 +0200 (Fri, 15 Aug 2008)
<br>> Checksum: d41d8cd98f00b204e9800998ecf8427e
<br>>
<br>> $ jsvn info -R
<br>> Path: Mu?ller.txt
<br>> Name: Mu?ller.txt
<br>> URL:
<br>> <a href="https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt</a>
<br>>
<br>> Repository Root: <a href="https://svn.kwarc.info/repos/sandbox" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox</a><br>> Revision: 1948
<br>> Node Kind: file
<br>> Schedule: normal
<br>> Last Changed Rev: 1948
<br>> Last Changed Date: 2008-08-15 18:09:47 +0200 (Fri, 15 Aug 2008)
<br>> Text Last Updated: 2008-08-15 18:07:33 +0200 (Fri, 15 Aug 2008)
<br>> Checksum: d41d8cd98f00b204e9800998ecf8427e
<br>>
<br>>
<br>> Normen Müller wrote:
<br>>> Alexander Kitaev wrote:
<br>>>> Hello,
<br>>>>
<br>>>> > org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14#writeString
<br>>>> This method escapes ASCII control characters, not all non-ASCII
<br>>>> characters. Does entries file created by SVNKit differs from those
<br>>>> created by native Subversion client? If so, could you please send both?
<br>>> Hmm, that's all a bit weired. Look at the following SVN commands/
<br>>> output
<br>>>
<br>>> $ svn st
<br>>> ? Mu?\204?\136ller.txt
<br>>>
<br>>> $ svn add *
<br>>> svn: warning: 'Müller.txt' not found
<br>>>
<br>>> And now with JSVN:
<br>>>
<br>>> $ jsvn add *
<br>>> A Mu?ller.txt
<br>>>
<br>>> the .svn/entries file look like this
<br>>>
<br>>> [snippet]
<br>>> Müller.txt
<br>>> file
<br>>> 1948
<br>>> <a href="https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt" target="_top" rel="nofollow">https://svn.kwarc.info/repos/sandbox/locutor/tests/registry/wca/Mu%CC%88ller.txt</a>
<br>>>
<br>>>
<br>>> However 'jsvn info' didn't work
<br>>>
<br>>> $ jsvn info Müller.txt
<br>>> M?ller.txt: (Not a versioned resource)
<br>>>
<br>>> What am I doing/ understanding wrong?
<br>>>
<br>>> BTW: Next Monday I will test these issues on a linux box.
<br>>>>
<br>>>> Alexander Kitaev,
<br>>>> TMate Software,
<br>>>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>>>
<br>>>> Normen Müller wrote:
<br>>>>> Alexander Kitaev wrote:
<br>>>>>> Hello Normen,
<br>>>>>>
<br>>>>>> entries file is stored in UTF-8 encoding. I think that \x or \u
<br>>>>>> escaping depends on the viewer program you're using, not on the
<br>>>>>> contents of the entries file (for non-ASCII characters there
<br>>>>>> should be several bytes stored in entries file without escaping).
<br>>>>> Actually I didn't use a specific viewer, but looked at
<br>>>>>
<br>>>>> org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14#writeString
<br>>>>>
<br>>>>> and in this method you explicitly encode, for example, 'Müller' to
<br>>>>> 'M\xFCller'. I wanted to use
<br>>>>> 'org.apache.commons.lang.StringEscapeUtils.escapeJava' but this
<br>>>>> method encodes 'Müller' to 'M\u00FCller'. Is that the reason you
<br>>>>> wrote your own encoding/ decoding methods? Cause if would write
<br>>>>> the output of StringEscapeUtils to .svn/entries your decoding will
<br>>>>> break, right?
<br>>>>>>
<br>>>>>> Also, on OSX JVM reports accented characters in file names as
<br>>>>>> two-character sequence, this sequence is replaced with single
<br>>>>>> accented character code (see SVNFileUtil.compose(...) method).
<br>>>>> You mean 'SVNFileListUtil#compose'?
<br>>>>>
<br>>>>> Now I am a bit confused :-\ May I write 'M\u00FCller' to
<br>>>>> .svn/entries or not?
<br>>>>>
<br>>>>> Cheers,
<br>>>>> /nm
<br>>>>>>
<br>>>>>> Alexander Kitaev,
<br>>>>>> TMate Software,
<br>>>>>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>>>>>
<br>>>>>> Normen Müller wrote:
<br>>>>>>> He,
<br>>>>>>>
<br>>>>>>> I wounder what encoding SVN requires? I am not sure, but it
<br>>>>>>> looks like 'Müller' encodes to 'M\xFCller' rather than
<br>>>>>>> 'M\u00FCller' what I have expected.
<br>>>>>>>
<br>>>>>>> Can anyone explain?
<br>>>>>>>
<br>>>>>>> Cheers,
<br>>>>>>> /nm
<br>>>>>>>
<br>>>>>>>
<br>>>>>>> ---------------------------------------------------------------------
<br>>>>>>>
<br>>>>>>> To unsubscribe, e-mail: svnkit-users-unsubscribe@svnkit.com
<br>>>>>>> For additional commands, e-mail: svnkit-users-help@svnkit.com
<br>>>>>>>
<br>>>>>>>
<br>>>>>>
<br>>>>>> ---------------------------------------------------------------------
<br>>>>>> To unsubscribe, e-mail: svnkit-users-unsubscribe@svnkit.com
<br>>>>>> For additional commands, e-mail: svnkit-users-help@svnkit.com
<br>>>>>>
<br>>>>>
<br>>>>>
<br>>>>> ---------------------------------------------------------------------
<br>>>>> To unsubscribe, e-mail: svnkit-users-unsubscribe@svnkit.com
<br>>>>> For additional commands, e-mail: svnkit-users-help@svnkit.com
<br>>>>>
<br>>>>
<br>>>> ---------------------------------------------------------------------
<br>>>> To unsubscribe, e-mail: svnkit-users-unsubscribe@svnkit.com
<br>>>> For additional commands, e-mail: svnkit-users-help@svnkit.com
<br>>>>
<br>>>
<br>>
<br>>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: svnkit-users-unsubscribe@svnkit.com
<br>For additional commands, e-mail: svnkit-users-help@svnkit.com
<br></div>
</div></blockquote>
<p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19337565Re: Getting all properties of a directory2008-09-05T12:02:55Z2008-09-05T12:02:55ZAlexander Sinyushkin-2Hello,
<br><br>You can now also take a look at an article and example code source
<br>devoted to this problem:
<br><br><a href="https://wiki.svnkit.com/Recursively%20fetching%20properties%20from%20a%20repository%20(low-level%20API" target="_top" rel="nofollow">https://wiki.svnkit.com/Recursively%20fetching%20properties%20from%20a%20repository%20(low-level%20API</a>)
<br><a href="https://wiki.svnkit.com/Recursively%20fetching%20properties%20from%20a%20repository%20in%20a%20single%20request" target="_top" rel="nofollow">https://wiki.svnkit.com/Recursively%20fetching%20properties%20from%20a%20repository%20in%20a%20single%20request</a><br>----
<br>Alexander Sinyushkin,
<br>TMate Software,
<br><a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br><br>svncheeta wrote:
<div class='shrinkable-quote'><br>> Hi,
<br>> In one of the posts, following code is suggested by you for getting all
<br>> the properties of a directory with better performance. Copy of that post is
<br>> below:
<br>>
<br>> --------------------
<br>> Instead of fetching properties recursively with getDir/getFile calls,
<br>> you may try using SVNRepository.status method to get properties for all
<br>> files in repository:
<br>>
<br>> final long rev = repos.getLatestRevision();
<br>> ISVNReporterBaton reporter = new ISVNReporterBaton() {
<br>> public void report(ISVNReporter reporter) throws SVNException {
<br>> reporter.setPath("", null, rev, true);
<br>> reporter.finishReport();
<br>> }
<br>> };
<br>> ISVNEditor editor = new ISVNEditor() {
<br>> public void addDir(...) {
<br>> }
<br>> public void addFile(...) {
<br>> }
<br>> public void changeDirProperty(...) {
<br>> }
<br>> public void changeFileProperty(...){
<br>> }
<br>> ....
<br>> };
<br>> repos.status(rev, null, true, reporter, editor);
<br>>
<br>> ---------------------------
<br>>
<br>> I am lost here and not sure how to get all the properties of a directory. Do
<br>> i need to provide all properties of a directory one by one to
<br>> editor.changeDirProperty(String, String)??? Where is the value of property
<br>> is returned as i can see the changeDirProperty does not return anything. Is
<br>> there anyway, that i dont have to give properties to this method at all and
<br>> get all the properties names and values? Kindly help, thanks.
</div><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19337565&i=0" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19337565&i=1" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19331957Re: Obtaining line by line history of a file2008-09-05T07:03:11Z2008-09-05T07:03:11ZAlexander Sinyushkin-2Hello,
<br>You may try this example as well:
<br><a href="https://wiki.svnkit.com/Annotating%20a%20file#preview" target="_top" rel="nofollow">https://wiki.svnkit.com/Annotating%20a%20file#preview</a><br><br>----
<br>Alexander Sinyushkin,
<br>TMate Software,
<br><a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br><br>mpp99tas wrote:
<div class='shrinkable-quote'><br>> I've spent a considerable time looking for this, so excuse me if this
<br>> information is available somewhere else.
<br>>
<br>> I'm trying to use SVNKit to obtain line by line revision history to a (java)
<br>> file. What I want to obtain is:
<br>>
<br>> - who was the last person to alter each line and when
<br>>
<br>> This is very similar to what happens in Eclipse/Subversive where you go to
<br>> team->show Annotations and you get a line by line annotations of who was the
<br>> last person to alter the line, when and the commit comment.
<br>>
<br>> If anyone could help with this I'd be grateful
<br>>
<br>> Toby
</div><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19331957&i=0" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19331957&i=1" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19331305Re: Obtaining line by line history of a file2008-09-05T06:29:52Z2008-09-05T06:29:52ZAlexander Kitaev-3Hello,
<br><br>To get annotation for a file you may use the following method:
<br><br>SVNClientManager cm = SVNClientManager.newInstance();
<br>cm.getLogClient().doAnnotate(..., new ISVNAnnotateHandler() {
<br> public void handleLine(....) {
<br> }
<br> ...
<br>});
<br><br>handleLine method will be called for each line of the file with
<br>necessary information (author, revision, etc).
<br><br>Alexander Kitaev,
<br>TMate Software,
<br><a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br><br>mpp99tas wrote:
<div class='shrinkable-quote'><br>> I've spent a considerable time looking for this, so excuse me if this
<br>> information is available somewhere else.
<br>>
<br>> I'm trying to use SVNKit to obtain line by line revision history to a (java)
<br>> file. What I want to obtain is:
<br>>
<br>> - who was the last person to alter each line and when
<br>>
<br>> This is very similar to what happens in Eclipse/Subversive where you go to
<br>> team->show Annotations and you get a line by line annotations of who was the
<br>> last person to alter the line, when and the commit comment.
<br>>
<br>> If anyone could help with this I'd be grateful
<br>>
<br>> Toby
</div><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19331305&i=0" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19331305&i=1" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19326664Obtaining line by line history of a file2008-09-05T01:01:32Z2008-09-05T01:01:32Zmpp99tasI've spent a considerable time looking for this, so excuse me if this information is available somewhere else.
<br><br>I'm trying to use SVNKit to obtain line by line revision history to a (java) file. What I want to obtain is:
<br><br> - who was the last person to alter each line and when
<br><br>This is very similar to what happens in Eclipse/Subversive where you go to team->show Annotations and you get a line by line annotations of who was the last person to alter the line, when and the commit comment.
<br><br>If anyone could help with this I'd be grateful
<br><br>Toby<p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19318396Re: Diff/Merge Question2008-09-04T12:36:04Z2008-09-04T12:36:04ZAlexander Sinyushkin-2What version of SVNKit do you use?
<br>----
<br>Alexander Sinyushkin,
<br>TMate Software,
<br><a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br><br>Vallone, Philip Mr CTR USA AMC wrote:
<div class='shrinkable-quote'><br>> Hi,
<br>>
<br>> I am trying the new tutorials just posted (thanks Alexander). In the
<br>> below code I am trying to do a diff/merge on a directory and ALWAYS take
<br>> revision version.
<br>>
<br>> <a href="https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch%20with%" target="_top" rel="nofollow">https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch%20with%</a><br>> 20conflicts
<br>>
<br>> I get this error:
<br>>
<br>> Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException
<br>> at
<br>> org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.runPeggedMerge(SVNMerg
<br>> eDriver.java:217)
<br>> at
<br>> org.tmatesoft.svn.core.wc.SVNDiffClient.doMerge(SVNDiffClient.java:1333)
<br>>
<br>> Code:
<br>>
<br>>
<br>> private void jMenuItem7ActionPerformed(java.awt.event.ActionEvent evt) {
<br>> try {
<br>> File wcRoot = new File("C:/temp/MYCOPY/");
<br>> File reposRoot = new File("C:/svn-repository");
<br>> SVNClientManager clientManager =
<br>> SVNClientManager.newInstance();
<br>> SVNURL reposURL = SVNURL.fromFile(reposRoot);
<br>>
<br>> SVNDiffClient diffClient = clientManager.getDiffClient();
<br>> DefaultSVNOptions options = (DefaultSVNOptions)
<br>> diffClient.getOptions();
<br>>
<br>>
<br>> options.setConflictHandler(new ConflictResolverHandler());
<br>> SVNRevisionRange rangeToMerge = new
<br>> SVNRevisionRange(SVNRevision.create(1), SVNRevision.HEAD);
<br>> diffClient.doMerge(reposURL, SVNRevision.HEAD,
<br>> Collections.singleton(rangeToMerge),
<br>> new File(wcRoot, ""), SVNDepth.UNKNOWN, true, false,
<br>> false, false);
<br>>
<br>>
<br>> } catch (SVNException ex) {
<br>>
<br>> Logger.getLogger(startForm.class.getName()).log(Level.SEVERE, null, ex);
<br>> }
<br>>
<br>> }
<br>> private static class ConflictResolverHandler implements
<br>> ISVNConflictHandler {
<br>>
<br>> public SVNConflictResult handleConflict(SVNConflictDescription
<br>> conflictDescription) throws SVNException {
<br>> SVNConflictReason reason =
<br>> conflictDescription.getConflictReason();
<br>> SVNMergeFileSet mergeFiles =
<br>> conflictDescription.getMergeFiles();
<br>>
<br>> SVNConflictChoice choice = SVNConflictChoice.THEIRS_FULL;
<br>> if (reason == SVNConflictReason.EDITED) {
<br>>
<br>> choice = SVNConflictChoice.THEIRS_FULL;
<br>> }
<br>> System.out.println("Automatically resolving conflict for " +
<br>> mergeFiles.getWCFile() +
<br>> ", choosing " + (choice ==
<br>> SVNConflictChoice.MINE_FULL ? "host file" : "repository file"));
<br>> return new SVNConflictResult(choice,
<br>> mergeFiles.getResultFile());
<br>> }
<br>>
<br>> }
<br>>
<br>> Thanks for the help.
<br>>
<br>> Phil
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19318396&i=0" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19318396&i=1" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>
<br>>
<br>>
</div><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19318396&i=2" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19318396&i=3" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19316305Diff/Merge Question2008-09-04T10:41:19Z2008-09-04T10:41:19ZBones<br>Hi,
<br><br>I am trying the new tutorials just posted (thanks Alexander). In the
<br>below code I am trying to do a diff/merge on a directory and ALWAYS take
<br>revision version.
<br><br><a href="https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch%20with%" target="_top" rel="nofollow">https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch%20with%</a><br>20conflicts
<br><br>I get this error:
<br><br>Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException
<br> at
<br>org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.runPeggedMerge(SVNMerg
<br>eDriver.java:217)
<br> at
<br>org.tmatesoft.svn.core.wc.SVNDiffClient.doMerge(SVNDiffClient.java:1333)
<br><br>Code:
<br><br><br>private void jMenuItem7ActionPerformed(java.awt.event.ActionEvent evt) {
<br> try {
<br> File wcRoot = new File("C:/temp/MYCOPY/");
<br> File reposRoot = new File("C:/svn-repository");
<br> SVNClientManager clientManager =
<br>SVNClientManager.newInstance();
<br> SVNURL reposURL = SVNURL.fromFile(reposRoot);
<br><br> SVNDiffClient diffClient = clientManager.getDiffClient();
<br> DefaultSVNOptions options = (DefaultSVNOptions)
<br>diffClient.getOptions();
<br><br><br> options.setConflictHandler(new ConflictResolverHandler());
<br> SVNRevisionRange rangeToMerge = new
<br>SVNRevisionRange(SVNRevision.create(1), SVNRevision.HEAD);
<br> diffClient.doMerge(reposURL, SVNRevision.HEAD,
<br>Collections.singleton(rangeToMerge),
<br> new File(wcRoot, ""), SVNDepth.UNKNOWN, true, false,
<br>false, false);
<br><br><br> } catch (SVNException ex) {
<br>
<br>Logger.getLogger(startForm.class.getName()).log(Level.SEVERE, null, ex);
<br> }
<br>
<br>}
<br> private static class ConflictResolverHandler implements
<br>ISVNConflictHandler {
<br>
<br> public SVNConflictResult handleConflict(SVNConflictDescription
<br>conflictDescription) throws SVNException {
<br> SVNConflictReason reason =
<br>conflictDescription.getConflictReason();
<br> SVNMergeFileSet mergeFiles =
<br>conflictDescription.getMergeFiles();
<br>
<br> SVNConflictChoice choice = SVNConflictChoice.THEIRS_FULL;
<br> if (reason == SVNConflictReason.EDITED) {
<br><br> choice = SVNConflictChoice.THEIRS_FULL;
<br> }
<br> System.out.println("Automatically resolving conflict for " +
<br>mergeFiles.getWCFile() +
<br> ", choosing " + (choice ==
<br>SVNConflictChoice.MINE_FULL ? "host file" : "repository file"));
<br> return new SVNConflictResult(choice,
<br>mergeFiles.getResultFile());
<br> }
<br>
<br> }
<br><br>Thanks for the help.
<br><br>Phil
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19316305&i=0" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19316305&i=1" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19315054RE: Diff-Merge Examples2008-09-04T09:43:26Z2008-09-04T09:43:26ZBonesNevermind....
<br><br>Thanks,
<br><br><br>-----Original Message-----
<br>From: Vallone, Philip Mr CTR USA AMC [mailto:<a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=0" target="_top" rel="nofollow">Philip.Vallone@...</a>]
<br><br>Sent: Thursday, September 04, 2008 12:22 PM
<br>To: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=1" target="_top" rel="nofollow">svnkit-users@...</a>
<br>Subject: RE: Diff-Merge Examples
<br><br><br> Hi Alexander,
<br><br>In the below tutoral there is a reference to:
<br><br>//initialize SVNKit to work through file:/// protocol
<br>SamplesUtility.initializeFSFSprotocol();
<br><br>Where can I find this? When I run the example:
<br><br>File wcRoot = new File("file:///C:/svn-repository");
<br><br>wcRoot equals base-dir + wcRoot:
<br><br>E.g.
<br><br>org.tmatesoft.svn.core.SVNException: svn:
<br>'C:\java-project\file:\C:\svn-repository' is not a working copy
<br><br><a href="https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep" target="_top" rel="nofollow">https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep</a><br>ository
<br><br>Thanks,
<br><br>Phil
<br><br><br>-----Original Message-----
<br>From: Alexander Sinyushkin [mailto:<a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=2" target="_top" rel="nofollow">Alexander.Sinyushkin@...</a>]
<br>Sent: Wednesday, September 03, 2008 2:10 PM
<br>To: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=3" target="_top" rel="nofollow">svnkit-users@...</a>
<br>Subject: Re: Diff-Merge Examples
<br><br>Hello Philip,
<br><br>Now you may take a look at several examples following this links:
<br><br><a href="https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep" target="_top" rel="nofollow">https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep</a><br>ository
<br><a href="https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20bas" target="_top" rel="nofollow">https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20bas</a><br>e%20revision
<br><a href="https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch" target="_top" rel="nofollow">https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch</a><br><br>They are quite straightforward and described step-be-step. If you have
<br>any remarks on them, your feedback is welcome.
<br><br>----
<br>Alexander Sinyushkin,
<br>TMate Software,
<br><a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br><br>Vallone, Philip Mr CTR USA AMC wrote:
<div class='shrinkable-quote'><br>> Thanks!
<br>>
<br>> -----Original Message-----
<br>> From: Alexander Sinyushkin [mailto:<a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=4" target="_top" rel="nofollow">Alexander.Sinyushkin@...</a>]
<br>> Sent: Tuesday, September 02, 2008 10:41 AM
<br>> To: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=5" target="_top" rel="nofollow">svnkit-users@...</a>
<br>> Subject: Re: Diff-Merge Examples
<br>>
<br>> Hello,
<br>>
<br>> I'm gonna write some today-tomorrow, I will let you know as soon as
<br>> they are ready.
<br>>
<br>> ----
<br>> Alexander Sinyushkin,
<br>> TMate Software,
<br>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>
<br>> Vallone, Philip Mr CTR USA AMC wrote:
<br>>> Hi List,
<br>>>
<br>>> Can someone point me to some Diff-Merge tutorals or examples?
<br>>>
<br>>> Thanks,
<br>>>
<br>>> Phil
<br>>>
<br>>>
<br>>> ---------------------------------------------------------------------
<br>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=6" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=7" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>
<br>>>
<br>>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=8" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=9" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=10" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=11" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>
<br>>
<br>>
</div><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=12" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=13" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=14" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=15" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=16" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19315054&i=17" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19314786Re: Diff-Merge Examples2008-09-04T09:43:09Z2008-09-04T09:43:09ZAlexander Sinyushkin-2Hello Philip,
<br><br>There's one more simple example - Merge with automatic conflicts
<br>resolution available at
<br><a href="https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch%20with%20conflicts#preview" target="_top" rel="nofollow">https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch%20with%20conflicts#preview</a><br><br>----
<br>Alexander Sinyushkin,
<br>TMate Software,
<br><a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br><br>Vallone, Philip Mr CTR USA AMC wrote:
<div class='shrinkable-quote'><br>>
<br>> Thank you Alexander. Much appreciated.
<br>>
<br>>
<br>> -----Original Message-----
<br>> From: Alexander Sinyushkin [mailto:<a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=0" target="_top" rel="nofollow">Alexander.Sinyushkin@...</a>]
<br>> Sent: Wednesday, September 03, 2008 2:10 PM
<br>> To: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=1" target="_top" rel="nofollow">svnkit-users@...</a>
<br>> Subject: Re: Diff-Merge Examples
<br>>
<br>> Hello Philip,
<br>>
<br>> Now you may take a look at several examples following this links:
<br>>
<br>> <a href="https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep" target="_top" rel="nofollow">https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep</a><br>> ository
<br>> <a href="https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20bas" target="_top" rel="nofollow">https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20bas</a><br>> e%20revision
<br>> <a href="https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch" target="_top" rel="nofollow">https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch</a><br>>
<br>> They are quite straightforward and described step-be-step. If you have
<br>> any remarks on them, your feedback is welcome.
<br>>
<br>> ----
<br>> Alexander Sinyushkin,
<br>> TMate Software,
<br>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>
<br>> Vallone, Philip Mr CTR USA AMC wrote:
<br>>> Thanks!
<br>>>
<br>>> -----Original Message-----
<br>>> From: Alexander Sinyushkin [mailto:<a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=2" target="_top" rel="nofollow">Alexander.Sinyushkin@...</a>]
<br>>> Sent: Tuesday, September 02, 2008 10:41 AM
<br>>> To: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=3" target="_top" rel="nofollow">svnkit-users@...</a>
<br>>> Subject: Re: Diff-Merge Examples
<br>>>
<br>>> Hello,
<br>>>
<br>>> I'm gonna write some today-tomorrow, I will let you know as soon as
<br>>> they are ready.
<br>>>
<br>>> ----
<br>>> Alexander Sinyushkin,
<br>>> TMate Software,
<br>>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>>
<br>>> Vallone, Philip Mr CTR USA AMC wrote:
<br>>>> Hi List,
<br>>>>
<br>>>> Can someone point me to some Diff-Merge tutorals or examples?
<br>>>>
<br>>>> Thanks,
<br>>>>
<br>>>> Phil
<br>>>>
<br>>>>
<br>>>> ---------------------------------------------------------------------
<br>>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=4" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=5" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>>
<br>>>>
<br>>>>
<br>>> ---------------------------------------------------------------------
<br>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=6" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=7" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>
<br>>>
<br>>> ---------------------------------------------------------------------
<br>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=8" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=9" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>
<br>>>
<br>>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=10" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=11" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=12" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=13" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>
<br>>
<br>>
</div><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=14" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314786&i=15" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19314709RE: Diff-Merge Examples2008-09-04T09:22:15Z2008-09-04T09:22:15ZBones<br> Hi Alexander,
<br><br>In the below tutoral there is a reference to:
<br><br>//initialize SVNKit to work through file:/// protocol
<br>SamplesUtility.initializeFSFSprotocol();
<br><br>Where can I find this? When I run the example:
<br><br>File wcRoot = new File("file:///C:/svn-repository");
<br><br>wcRoot equals base-dir + wcRoot:
<br><br>E.g.
<br><br>org.tmatesoft.svn.core.SVNException: svn:
<br>'C:\java-project\file:\C:\svn-repository' is not a working copy
<br><br><a href="https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep" target="_top" rel="nofollow">https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep</a><br>ository
<br><br>Thanks,
<br><br>Phil
<br><br><br>-----Original Message-----
<br>From: Alexander Sinyushkin [mailto:<a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=0" target="_top" rel="nofollow">Alexander.Sinyushkin@...</a>]
<br>Sent: Wednesday, September 03, 2008 2:10 PM
<br>To: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=1" target="_top" rel="nofollow">svnkit-users@...</a>
<br>Subject: Re: Diff-Merge Examples
<br><br>Hello Philip,
<br><br>Now you may take a look at several examples following this links:
<br><br><a href="https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep" target="_top" rel="nofollow">https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep</a><br>ository
<br><a href="https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20bas" target="_top" rel="nofollow">https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20bas</a><br>e%20revision
<br><a href="https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch" target="_top" rel="nofollow">https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch</a><br><br>They are quite straightforward and described step-be-step. If you have
<br>any remarks on them, your feedback is welcome.
<br><br>----
<br>Alexander Sinyushkin,
<br>TMate Software,
<br><a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br><br>Vallone, Philip Mr CTR USA AMC wrote:
<div class='shrinkable-quote'><br>> Thanks!
<br>>
<br>> -----Original Message-----
<br>> From: Alexander Sinyushkin [mailto:<a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=2" target="_top" rel="nofollow">Alexander.Sinyushkin@...</a>]
<br>> Sent: Tuesday, September 02, 2008 10:41 AM
<br>> To: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=3" target="_top" rel="nofollow">svnkit-users@...</a>
<br>> Subject: Re: Diff-Merge Examples
<br>>
<br>> Hello,
<br>>
<br>> I'm gonna write some today-tomorrow, I will let you know as soon as
<br>> they are ready.
<br>>
<br>> ----
<br>> Alexander Sinyushkin,
<br>> TMate Software,
<br>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>
<br>> Vallone, Philip Mr CTR USA AMC wrote:
<br>>> Hi List,
<br>>>
<br>>> Can someone point me to some Diff-Merge tutorals or examples?
<br>>>
<br>>> Thanks,
<br>>>
<br>>> Phil
<br>>>
<br>>>
<br>>> ---------------------------------------------------------------------
<br>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=4" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=5" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>
<br>>>
<br>>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=6" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=7" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=8" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=9" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>
<br>>
<br>>
</div><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=10" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=11" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=12" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19314709&i=13" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19312055Re: Getting all properties of a directory2008-09-04T07:40:59Z2008-09-04T07:40:59ZAlexander Kitaev-3Hello,
<br><br> > I am lost here and not sure how to get all the properties of a
<br>directory. Do
<br> > i need to provide all properties of a directory one by one to
<br> > editor.changeDirProperty(String, String)??? Where is the value of
<br>property
<br> > is returned as i can see the changeDirProperty does not return
<br>anything. Is
<br> > there anyway, that i dont have to give properties to this method at
<br>all and
<br> > get all the properties names and values? Kindly help, thanks.
<br><br>In that example you do not have to call changeDirProperty method at all
<br>- quite opposite - this method of your ISVNEditor implementation
<br>(anonymous class in the example) will be called by SVNRepository.status
<br>method and you will receive property name and value in changeDirProperty
<br>- which is part of your implementation of ISVNEditor interface.
<br><br>Alexander Kitaev,
<br>TMate Software,
<br><a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br><br>svncheeta wrote:
<div class='shrinkable-quote'><br>> Hi,
<br>> In one of the posts, following code is suggested by you for getting all
<br>> the properties of a directory with better performance. Copy of that post is
<br>> below:
<br>>
<br>> --------------------
<br>> Instead of fetching properties recursively with getDir/getFile calls,
<br>> you may try using SVNRepository.status method to get properties for all
<br>> files in repository:
<br>>
<br>> final long rev = repos.getLatestRevision();
<br>> ISVNReporterBaton reporter = new ISVNReporterBaton() {
<br>> public void report(ISVNReporter reporter) throws SVNException {
<br>> reporter.setPath("", null, rev, true);
<br>> reporter.finishReport();
<br>> }
<br>> };
<br>> ISVNEditor editor = new ISVNEditor() {
<br>> public void addDir(...) {
<br>> }
<br>> public void addFile(...) {
<br>> }
<br>> public void changeDirProperty(...) {
<br>> }
<br>> public void changeFileProperty(...){
<br>> }
<br>> ....
<br>> };
<br>> repos.status(rev, null, true, reporter, editor);
<br>>
<br>> ---------------------------
<br>>
<br>> I am lost here and not sure how to get all the properties of a directory. Do
<br>> i need to provide all properties of a directory one by one to
<br>> editor.changeDirProperty(String, String)??? Where is the value of property
<br>> is returned as i can see the changeDirProperty does not return anything. Is
<br>> there anyway, that i dont have to give properties to this method at all and
<br>> get all the properties names and values? Kindly help, thanks.
</div><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19312055&i=0" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19312055&i=1" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19312004Re: Upgrade SvnKit 1.1.7 to 1.22008-09-04T07:38:42Z2008-09-04T07:38:42ZAlexander Kitaev-3Hello,
<br><br> > Can you tell me those methods are really removed? I have find alternate
<br> > method to that to use... or they are missed in this beta release (I.e., I
<br> > can expect those methods in final release of 1.2)
<br>SVNKit 1.2.0 is not binary compatible with 1.1.x versions - we have to
<br>take this decision in order to release 1.2.0 earlier - keeping binary
<br>compatibility would delay 1.2.0 release significantly.
<br><br>Regarding ISVNOptions methods - those have been removed from the
<br>interface, but most of them are still in DefaultSVNOptions class. We
<br>removed those methods that we consider should not be used by SVNKit API
<br>users, but rather specific for SVNKit implementation - and this
<br>modification makes it easier to implement ISVNOptions interface as there
<br>are less methods to implement.
<br><br>For instance, isIgnored method merely matched file name against global
<br>ignore patterns. Instead of removed isIgonored method you may use static
<br>DefaultSVNOptions.isIgnored(ISVNOptions options, String name) method.
<br><br>Please let me know what other problems have you encountered while
<br>switching to 1.2.0 - I'll be glad to help.
<br><br>Alexander Kitaev,
<br>TMate Software,
<br><a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br><br>S Prabhu wrote:
<div class='shrinkable-quote'><br>> Hi Alexander,
<br>>
<br>> I have seen the SVN Kit 1.2 Java doc. And noticed few methods were removed
<br>> (eg, isIgnored in ISVNOption)
<br>> I am shocked those methods are not available with SVN Kit 1.2. And this
<br>> methods are not even specified as deprecated in the previous version and
<br>> suddenly removed here.
<br>> Can you tell me those methods are really removed? I have find alternate
<br>> method to that to use... or they are missed in this beta release (I.e., I
<br>> can expect those methods in final release of 1.2)
<br>>
<br>> Currently I am using SVNKit 1.1.7 version
<br>>
<br>> Thanks
<br>> S.Prabhu
<br>>
<br>>
<br>> Alexander Sinyushkin-2 wrote:
<br>>> Hello,
<br>>> You may take a look at the
<br>>> <a href="http://svn.svnkit.com/repos/svnkit/tags/1.2.0-rc1/changelog.txt" target="_top" rel="nofollow">http://svn.svnkit.com/repos/svnkit/tags/1.2.0-rc1/changelog.txt</a><br>>> file. Subversion's 1.5 changelog file which you may find at
<br>>> <a href="http://svn.collab.net/repos/svn/tags/1.5.0/CHANGES" target="_top" rel="nofollow">http://svn.collab.net/repos/svn/tags/1.5.0/CHANGES</a> will probably appear
<br>>> interesting to you as well.
<br>>>
<br>>> ----
<br>>> Alexander Sinyushkin,
<br>>> TMate Software,
<br>>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>>
<br>>> S Prabhu wrote:
<br>>>> Hi,
<br>>>>
<br>>>> Currently I am using 1.1.7 version of SVNKit. And planning to upgrade to
<br>>>> 1.2
<br>>>> version of SVNKit.
<br>>>> Can somebody please tell me the list of changes with svnkit. So that I
<br>>>> can
<br>>>> estimate my work....
<br>>>>
<br>>>> Thanks in Advance...
<br>>>>
<br>>>>
<br>>> ---------------------------------------------------------------------
<br>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19312004&i=0" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19312004&i=1" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>
<br>>>
<br>>>
<br>>
</div><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19312004&i=2" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19312004&i=3" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br><br><p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19307921Getting all properties of a directory2008-09-04T03:51:45Z2008-09-04T03:51:45ZsvncheetaHi,
<br> In one of the posts, following code is suggested by you for getting all the properties of a directory with better performance. Copy of that post is below:
<br><br>--------------------
<br>Instead of fetching properties recursively with getDir/getFile calls,
<br>you may try using SVNRepository.status method to get properties for all
<br>files in repository:
<br><br>final long rev = repos.getLatestRevision();
<br>ISVNReporterBaton reporter = new ISVNReporterBaton() {
<br> public void report(ISVNReporter reporter) throws SVNException {
<br> reporter.setPath("", null, rev, true);
<br> reporter.finishReport();
<br> }
<br>};
<br>ISVNEditor editor = new ISVNEditor() {
<br> public void addDir(...) {
<br> }
<br> public void addFile(...) {
<br> }
<br> public void changeDirProperty(...) {
<br> }
<br> public void changeFileProperty(...){
<br> }
<br> ....
<br>};
<br>repos.status(rev, null, true, reporter, editor);
<br><br>---------------------------
<br><br>I am lost here and not sure how to get all the properties of a directory. Do i need to provide all properties of a directory one by one to editor.changeDirProperty(String, String)??? Where is the value of property is returned as i can see the changeDirProperty does not return anything. Is there anyway, that i dont have to give properties to this method at all and get all the properties names and values? Kindly help, thanks.<p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19304880Re: SVNException thrown when commit added binary files (if server uses SASL authentication)2008-09-04T00:27:22Z2008-09-04T00:27:22ZzakhavWith RC2 all works OK. Good job boys! Thanks ;)<p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19303538Re: Upgrade SvnKit 1.1.7 to 1.22008-09-03T22:20:34Z2008-09-03T22:20:34ZS PrabhuHi Alexander,
<br><br>I have seen the SVN Kit 1.2 Java doc. And noticed few methods were removed (eg, isIgnored in ISVNOption)
<br>I am shocked those methods are not available with SVN Kit 1.2. And this methods are not even specified as deprecated in the previous version and suddenly removed here.
<br>Can you tell me those methods are really removed? I have find alternate method to that to use... or they are missed in this beta release (I.e., I can expect those methods in final release of 1.2)
<br><br>Currently I am using SVNKit 1.1.7 version
<br><br>Thanks
<br>S.Prabhu
<br><br><blockquote class="quote light-black dark-border-color"><div class="quote light-border-color">
<div class="quote-author" style="font-weight: bold;">Alexander Sinyushkin-2 wrote:</div>
<div class="quote-message shrinkable-quote">Hello,
<br>You may take a look at the
<br><a href="http://svn.svnkit.com/repos/svnkit/tags/1.2.0-rc1/changelog.txt" target="_top" rel="nofollow">http://svn.svnkit.com/repos/svnkit/tags/1.2.0-rc1/changelog.txt</a><br>file. Subversion's 1.5 changelog file which you may find at
<br><a href="http://svn.collab.net/repos/svn/tags/1.5.0/CHANGES" target="_top" rel="nofollow">http://svn.collab.net/repos/svn/tags/1.5.0/CHANGES</a> will probably appear
<br>interesting to you as well.
<br><br>----
<br>Alexander Sinyushkin,
<br>TMate Software,
<br><a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br><br>S Prabhu wrote:
<br>> Hi,
<br>>
<br>> Currently I am using 1.1.7 version of SVNKit. And planning to upgrade to 1.2
<br>> version of SVNKit.
<br>> Can somebody please tell me the list of changes with svnkit. So that I can
<br>> estimate my work....
<br>>
<br>> Thanks in Advance...
<br>>
<br>>
<br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: svnkit-users-unsubscribe@svnkit.com
<br>For additional commands, e-mail: svnkit-users-help@svnkit.com
<br></div>
</div></blockquote>
<p>From forum: <a href="http://www.nabble.com/SVNKit---Users-f18684.html" embed="fixTarget[18684]" target="_top" >SVNKit - Users</a></p>tag:www.nabble.com,2006:post-19295021RE: Diff-Merge Examples2008-09-03T11:18:06Z2008-09-03T11:18:06ZBones
<br>Thank you Alexander. Much appreciated.
<br><br><br>-----Original Message-----
<br>From: Alexander Sinyushkin [mailto:<a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19295021&i=0" target="_top" rel="nofollow">Alexander.Sinyushkin@...</a>]
<br>Sent: Wednesday, September 03, 2008 2:10 PM
<br>To: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19295021&i=1" target="_top" rel="nofollow">svnkit-users@...</a>
<br>Subject: Re: Diff-Merge Examples
<br><br>Hello Philip,
<br><br>Now you may take a look at several examples following this links:
<br><br><a href="https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep" target="_top" rel="nofollow">https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20rep</a><br>ository
<br><a href="https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20bas" target="_top" rel="nofollow">https://wiki.svnkit.com/Diffing%20a%20working%20copy%20against%20a%20bas</a><br>e%20revision
<br><a href="https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch" target="_top" rel="nofollow">https://wiki.svnkit.com/Merging%20from%20trunk%20to%20a%20branch</a><br><br>They are quite straightforward and described step-be-step. If you have
<br>any remarks on them, your feedback is welcome.
<br><br>----
<br>Alexander Sinyushkin,
<br>TMate Software,
<br><a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br><br>Vallone, Philip Mr CTR USA AMC wrote:
<div class='shrinkable-quote'><br>> Thanks!
<br>>
<br>> -----Original Message-----
<br>> From: Alexander Sinyushkin [mailto:<a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19295021&i=2" target="_top" rel="nofollow">Alexander.Sinyushkin@...</a>]
<br>> Sent: Tuesday, September 02, 2008 10:41 AM
<br>> To: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19295021&i=3" target="_top" rel="nofollow">svnkit-users@...</a>
<br>> Subject: Re: Diff-Merge Examples
<br>>
<br>> Hello,
<br>>
<br>> I'm gonna write some today-tomorrow, I will let you know as soon as
<br>> they are ready.
<br>>
<br>> ----
<br>> Alexander Sinyushkin,
<br>> TMate Software,
<br>> <a href="http://svnkit.com/" target="_top" rel="nofollow">http://svnkit.com/</a> - Java [Sub]Versioning Library!
<br>>
<br>> Vallone, Philip Mr CTR USA AMC wrote:
<br>>> Hi List,
<br>>>
<br>>> Can someone point me to some Diff-Merge tutorals or examples?
<br>>>
<br>>> Thanks,
<br>>>
<br>>> Phil
<br>>>
<br>>>
<br>>> ---------------------------------------------------------------------
<br>>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19295021&i=4" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19295021&i=5" target="_top" rel="nofollow">svnkit-users-help@...</a>
<br>>>
<br>>>
<br>>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&post=19295021&i=6" target="_top" rel="nofollow">svnkit-users-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://www.nabble.com/user/SendEmail.jtp?type=post&po