merge - unfixable mixed-revision working copy in svn? -


i have branch checkout clean (no modifications) cannot reintegrate trunk branch, because svn thinks have mixed-revision working copy:

c:\myproject> svnversion 2045:2047

the problem seems caused 1 of externals:

c:\myproject> svn propget svn:externals tools -r1448 ^/tools/external/trunk/gandalf/bin gandalf/bin -r1508 ^/tools/external/trunk/gandalf/include gandalf/include -r1508 ^/tools/external/trunk/gandalf/lib gandalf/lib -r1428 ^/tools/external/trunk/jsdb jsdb -r2045 ^/tools/external/trunk/java/lib/jing.jar jing.jar

you note of them directory externals rather single-file externals, except jing.jar, same version "svnversion" thinks lowest range of working copy, supposed clean checkout of r2047.

how fix this? (besides not using single-file external)

i've tried doing updates, fresh checkouts, , svn cleanup, , still has problem. i'm using tortoisesvn 1.6.12

looks you're not 1 problem.

the fix use equivalent of svn update --ignore-externals

see here: reintegrate branch externals fails in svn


Comments

Post a Comment

Popular posts from this blog

apache - Add omitted ? to URLs -

i working on website cms reads page name of query string, e.g. http://exmaple.com/?pagename . trying create rewrite rule rewrite ? . so, user types in /pagename , taken /?pagename try this: rewriteengine on rewritecond %{request_filename} !-d rewritecond %{request_filename} !-f rewriterule ^/?(.*) index.php?$1 [l]
Read more

redirect - bbPress Forum - rewrite to wwww.mysite prohibits login -

i using bbpress installation without wordpress integration. the redirect of rewriteengine @ forum site works: rewriteengine on rewritecond %{http_host} ^forum.mysite.com$ rewriterule (.*)$ http://www.forum.mysite.com/$1 [r=301,l] the problem login pppress. bbpress login not recognize: http://www.forum.mysite/bb-login.php . it redirects to: http://forum.mysite.com/bb-login.php . i tried permalink settings none , name based, same issue. does uses redirect in bbpress or how can eliminate "double" content , redirect permanently www.? i redirected www.forum.mysite.com forum.mysite.com , achieved eliminate "double" content.
Read more

php - How can I stop spam on my custom forum/blog? -

so have custom built forum & blog system of late has been dealing lot of spam. if wordpress use akismet, if different common platform i'm sure i'd find plugin. there kind of static class can download this? using php. i'd still go akismet, if it. uses outside of wordpress, may have pay fee it, depending on use -- check terms , conditions -- it's option , easy implement in php using api. use api key wordpress. com account access. basically, grab whichever php client library takes fancy -- use alex potsides' php5 library -- plug in key, , it's handful of lines of code. here's bare bones of validation straight 1 of live sites: ... if ($akismet) { $akismet->setcommentauthor($name); $akismet->setcommentauthoremail($session->userinfo["email"]); $akismet->setcommentauthorurl(""); $akismet->setcommentcontent($sentence);...
Read more