Wrong output from "svn log --use-merge-history --stop-on-copy"
Steps to reproduce the issue: Start from empty module with standard structure created under repository root: \-module |-branches |-tags \-trunk Perform the following sequence of commands from checked out trunk: echo "content" > file.txt svn add file.txt svn commit -m "creating file" svn copy -m "creating branch" "^/module/trunk" "^/module/branches/branch" svn switch "^/module/branches/branch" echo "modified content" > file.txt svn commit -m "modifying file in branch" svn switch "^/module/trunk" svn merge "^/module/branches/branch" svn commit -m "merging changes from branch" svn copy file.txt file-copy.txt svn commit -m "copying file" Now the following command: svn log --use-merge-history --stop-on-copy "^/module/trunk/file-copy.txt" produces: r195 | WizarD | 2011-08-27 13:02:53 +0400 (Сб, 27 авг 2011) | 1 line copying file r193 | WizarD | 2011-08-27 13:02:29 +0400 (Сб, 27 авг 2011) | 1 line Merged via: r195 modifying file in branch r192 | WizarD | 2011-08-27 13:02:17 +0400 (Сб, 27 авг 2011) | 1 line Merged via: r195 creating branch although no merging was performed in r195. The above was checked with local repository using Subversion 1.6.17 on Windows (1.6.17-SlikSvn-tag-1.6.17@1130896-WIN32).
svnsync 1.6.17: Unknown command 'failure'
Hello, I'm trying to synchronize a repository from the svn server running version 1.4.6 (r28521). The svnsync sync stops on a revision that has strange Unicode characters in the commit message and displays the "Unknown command 'failure'" message. The svn log command shows this commit message for that revision: Text: ?\131?\196(EOT)[]?\195?\141v Hex: 3f 5c 31 33 31 3f 5c 31 39 36 04 5b 5d 3f 5c 31 39 35 3f 5c 31 34 31 76 The (EOT) in the message is the End-of-tape character, ASCII 04. If I save the log as XML, this characters are saved: Ä?\004[]ĂŤv c4 3f 5c 30 30 34 5b 5d c3 8d 76 These are the version of the tools used: svnsync, version 1.6.17 (r1128011) compiled May 30 2011, 14:52:54 svnserve, version 1.4.6 (r28521) compiled Dec 20 2007, 16:33:06 Is there a way to get this revision synced to the mirror repository? Best regards, Jozef Izso.
(How to ?) copy latest rev of a sub-tree to new repo
Dear SVN users, After scratching my head for a while and reading documentation as best as I can, I am not able to see a good method for doing the following. We use SVN to develop software for an embedded system. Our 'C' code is developed in parts of the tree that are grouped by project. We have a seperate tree containing the embedded file system. The file system tree's binaries and libraries are populated automatically by using SVN externals from the parts of the tree that we use to develop our code. In other words, after a major source code change, the programmer commits the library or executable and by the magic of SVN:externals is appears at the right place on the file system. A developer only needs to check out his part of the repo, but can automatically contribute to our final output, the embedded filesystem. For releases we copy our trunk to a tag, rebuild all the code, commit the libraries and binaries to the tag and then create our file system by pulling in the newly comitted binaries/libraries from that tag. That way, a release is guarenteed to have libraries corrospond to the source code. It works well for us. Problem is, it is not so great for creating a test release. For us to build our embedded file system, we *have* to pull its files from SVN and that means a lot of commits only for testing. Our svn repo is 7GB+ and growing too fast. So here is a simple solution - i thought - for a test release, we extract rev HEAD from the trunk repository, copy to a temporary SVN repository created on the fly. This will include all our svn:externals definitions. We build the code in the project trees, commit to the temporary repository and build our file-system from it. If it is a bad test, we just delete the temp repository. Fix the trunk in the real repo and start again. Here is where I need help. I can not find a way of extracting HEAD from a sub-part of the repo to create a new temp repo. 1. svnadmin dump followed by a load would re-create our entire repository, when I really only need a part. Yes, I could svndumpfilter as a second step but we are now talking some massive CPU overhead. Secondly it forces us to build on the same machine (right ?) since you can't dump a URL. 2. svnsync can do copies of sub-trees (as of v1.5) but it would copy the entire history. 3. svn-hot-copy would copy the entire repo and all history. 4. svn export followed by svn import would lose all the SVN: externals - our binaries would get build but never appear in the file-system tree. Am I missing a solution ? appreciate your time and comments Thanks Gertjan -- == Gertjan Hofman ghofman [at] gmail.com gertjan.hofman [at] honeywell.com 604-982-3574 ==
Issue when running svn server on windows, any help please?
Dear All I've installed svn-win32-1.6.17 on my existing Apache 2.2.17 from WAMP x32 on a Win7 x64 server, and it works quite ok locally, but not from a remote client. Is there any advice you guys can give me to help fix this problem? More specifically: - from the svn server PC, I can do svn operations to "localhost", or to "127.0.0.1", but not to "name-of-the-svn-server" (which is the same pc) - from a remote client PC, I can't do svn operations to "name-of-the-svn-server" Though, from the svn server PC, I can browse http://name-of-the-svn-server/, and I can also do it from the remote client PC. I suspect it has something to do with IPv6 versus IPv4 nd SVN/Apache, no? Regards -Roland
Re: svnsync 1.6.17: Unknown command 'failure'
http://svn.apache.org/viewvc?rev=1148424&view=rev seems related. It hasn't been backported to 1.6.x. wrt the log message, hard to tell what happened exactly. The right output to share is 'svn pget --revprop --strict svn:log | xxd', but at a guess it's a non-UTF-8 log message. (so it would need to be recoded prior to or during the sync; new versions of svnsync can do that during the sync.) Jozef Izso wrote on Sat, Aug 27, 2011 at 14:10:01 +0200: > Hello, > > I'm trying to synchronize a repository from the svn server running version > 1.4.6 (r28521). > The svnsync sync stops on a revision that has strange Unicode characters in > the commit message and displays the "Unknown command 'failure'" message. > The svn log command shows this commit message for that revision: > > Text: ?\131?\196(EOT)[]?\195?\141v > Hex: 3f 5c 31 33 31 3f 5c 31 39 36 04 5b 5d 3f 5c 31 39 35 3f 5c 31 34 31 76 > > The (EOT) in the message is the End-of-tape character, ASCII 04. > > If I save the log as XML, this characters are saved: > > Ä?\004[]ĂŤv > c4 3f 5c 30 30 34 5b 5d c3 8d 76 > > > These are the version of the tools used: > > svnsync, version 1.6.17 (r1128011) >compiled May 30 2011, 14:52:54 > > svnserve, version 1.4.6 (r28521) >compiled Dec 20 2007, 16:33:06 > > > Is there a way to get this revision synced to the mirror repository? > > > Best regards, > Jozef Izso.
Re: svnsync 1.6.17: Unknown command 'failure'
The output from the xxd tool is: 000: 3f5c 3133 313f 5c31 3936 045b 5d3f 5c31 ?\131?\196.[]?\1 010: 3935 3f5c 3134 3176 95?\141v PS: Daniel, thanks for sharing the correct command to get the log message bytes. On Sun, Aug 28, 2011 at 23:35, Daniel Shahaf wrote: > http://svn.apache.org/viewvc?rev=1148424&view=rev seems related. > > It hasn't been backported to 1.6.x. > > > wrt the log message, hard to tell what happened exactly. The right > output to share is 'svn pget --revprop --strict svn:log | xxd', but at > a guess it's a non-UTF-8 log message. (so it would need to be recoded > prior to or during the sync; new versions of svnsync can do that during > the sync.) > > > > Jozef Izso wrote on Sat, Aug 27, 2011 at 14:10:01 +0200: > > Hello, > > > > I'm trying to synchronize a repository from the svn server running > version > > 1.4.6 (r28521). > > The svnsync sync stops on a revision that has strange Unicode characters > in > > the commit message and displays the "Unknown command 'failure'" message. > > The svn log command shows this commit message for that revision: > > > > Text: ?\131?\196(EOT)[]?\195?\141v > > Hex: 3f 5c 31 33 31 3f 5c 31 39 36 04 5b 5d 3f 5c 31 39 35 3f 5c 31 34 31 > 76 > > > > The (EOT) in the message is the End-of-tape character, ASCII 04. > > > > If I save the log as XML, this characters are saved: > > > > ƒÄ?\004[]ĂŤv > > c4 3f 5c 30 30 34 5b 5d c3 8d 76 > > > > > > These are the version of the tools used: > > > > svnsync, version 1.6.17 (r1128011) > >compiled May 30 2011, 14:52:54 > > > > svnserve, version 1.4.6 (r28521) > >compiled Dec 20 2007, 16:33:06 > > > > > > Is there a way to get this revision synced to the mirror repository? > > > > > > Best regards, > > Jozef Izso. > -- Jozef
Re: Issue when running svn server on windows, any help please?
On Sat, Aug 27, 2011 at 4:50 PM, Roland Le Franc wrote: > Dear All > > I've installed svn-win32-1.6.17 on my existing Apache 2.2.17 from WAMP x32 > on a Win7 x64 server, and it works quite ok locally, but not from a remote > client. > Is there any advice you guys can give me to help fix this problem? > > More specifically: > - from the svn server PC, I can do svn operations to "localhost", or to > "127.0.0.1", but not to "name-of-the-svn-server" (which is the same pc) > - from a remote client PC, I can't do svn operations to > "name-of-the-svn-server" I assume you're using https://hostname/reponame/ or some other URL, and "https://localhost/reponame/ works? Either your Apache is not configured to serve the externally facing network ports with the Subversion services, or the firewall is blocking traffic, or something else is going on. What do your Apache logs say? > Though, from the svn server PC, I can browse http://name-of-the-svn-server/, > and I can also do it from the remote client PC. "Browsing" is not quite the same as a Subversion checkout or Subversion browsing. What does a robust SVN client like TortoiseSVN show if you browse the repository? And since you're using HTTP and not HTTPS, I assume this is a read-only repository on HTTP? > I suspect it has something to do with IPv6 versus IPv4 nd SVN/Apache, no? > > Regards > -Roland Ohhh, have you set up IPv6 and maybe have a mixed IPv6/IPv4 stack? somewhere in this?
