Re: couldn't svn rm a file a...@bb.com

2011-05-25 Thread Ryan Schmidt
On May 25, 2011, at 21:00, wangbin wrote: > > I intend to svn rm a file named likes a...@bb.com, svn could find this file > > $svn rm "scmtools\@tc-cm-et18.tc.baidu.com" > svn: 'scmtools\' does not exist > $svn rm "*.tc.baidu.com" > svn: '*.tc.baidu.com' does not exist > $ svn info "scmto

couldn't svn rm a file a...@bb.com

2011-05-25 Thread wangbin
I intend to svn rm a file named likes a...@bb.com, svn could find this file $svn rm "scmtools\@tc-cm-et18.tc.baidu.com" svn: 'scmtools\' does not exist $svn rm "*.tc.baidu.com" svn: '*.tc.baidu.com' does not exist $ svn info "scmto...@tc-cm-et18.tc.baidu.com" svn: Try 'svn help'

Re: tree conflict: local add, incoming add upon merge

2011-05-25 Thread David Tombs
On 05/25/2011 07:45 AM, Stephen Butler wrote: > Hi David, > > Attached is a reproduction script. I could reproduce the corrupted working > copy in 1.6.16. > > With 1.7 (r1127008), the corruption doesn't occur, but there's still a bug: > 'svn status' displays bar.java (as deleted) after the merge

Re: tree conflict: local add, incoming add upon merge

2011-05-25 Thread Stephen Butler
On May 25, 2011, at 1:35 , David Tombs wrote: > On 05/24/2011 11:05 AM, Stefan Sperling wrote: >> On Tue, May 24, 2011 at 10:45:09AM -0400, David Tombs wrote: >>> Hi Subversion Gurus, >>> >>> I have a question about merging with a tree conflict. >>> >>> I created the same directory, called 'con

Re: can I use post-commit hook to produce a C header file?

2011-05-25 Thread Ryan Schmidt
Remember to Reply All when you reply so this discussion stays on the mailing list so others can benefit and participate. On May 25, 2011, at 03:40, 宋哲 wrote: > Ryan Schmidt: > thanks for your reply. > > If use work copy, that will work fine. > > But when I distribute my stuff, I pr

Re: tree conflict: local add, incoming add upon merge

2011-05-25 Thread Stefan Sperling
On Tue, May 24, 2011 at 07:35:49PM -0400, David Tombs wrote: > Thanks for the response. Unfortunately, I don't think my solution turned > out very well. I ended up with a corrupted working copy that thought > bar.java was there but the server disagreed whenever I did a > server-hitting command. Re

Re: can I use post-commit hook to produce a C header file?

2011-05-25 Thread Ryan Schmidt
On May 25, 2011, at 02:26, 宋哲 wrote: > I want to use post-commit hook to produce a c header file, so I can get the > latest revision number from my c codec. But I can not do that because in > post-commit hook script, I don't known how to put a header file into the repo. In your post-commit you

can I use post-commit hook to produce a C header file?

2011-05-25 Thread 宋哲
I want to use post-commit hook to produce a c header file, so I can get the latest revision number from my c codec. But I can not do that because in post-commit hook script, I don't known how to put a header file into the repo. $Rev$ can get a paiticular file's revision number, but I want to get