10 sep 2010 kl. 04:16 skrev LiuYan 刘研 <lovet...@21cn.com>:
> > Hi, > > I'm learning Subversion via svn-book, I encountered a problem in section > "Reintegrating a Branch": > http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate > > In this section, it use the following syntax: > svn merge --reintegrate ^/branches/my-calc-branch > > But when I try it, it always report an error: > E:\Incoming\svntest\calc\trunk>svn merge ^../branches/my-calc-branch > --reintegrate Don't mix ^ with .. > > svn: 不能打开文件“file:///E:/SVNRepository/svntest/calc/branches/.svn/entries”: > 文件名、目录名或卷标语法不正确。 > (can't open file > "file:///E:/SVNRepository/svntest/calc/branches/.svn/entries": File > name、Directory name or volume syntax incorrect) > > Then I try full URL syntax (which is in svn-book-1.5), it works. > E:\Incoming\svntest\calc\trunk>svn merge --reintegrate > file:///E:/SVNRepository/svntest/calc/branches/my-calc-branch > --- 正在合并版本库 URL 之间的差异到 “.”： > U int.c > U . > > > I search the svn log of svn-book, I found this syntax was changed in > svn-book-r3383: > "Modify ch01 and ch04 to use new ^ URL syntax. (Issue #23.)" > > So, does svn merge --reintegrate ^URL syntax really work ? > -- > View this message in context: > http://old.nabble.com/Does-svn-merge---reintegrate-%5EURL-syntax-really-work---tp29673121p29673121.html > Sent from the Subversion Users mailing list archive at Nabble.com. >
