svn - Replacing directory with external results in "working copy locked" on `update` -


(related to: svn externals repo "is locked" on update)

i started off repository structure this:

^/ ├ module1/ │ ├ foo/ │ ├ bar/ │ ├ baz/ ├ module2/

the directory ^/bar antiquated copy of module2, , decided better external modern version, instead of byte-wise copy:

^/ ├ module1/ │ │ (external: "^/module2 bar") │ ├ foo/ │ ├ baz/ ├ module2/

setting went smoothly:

svn co svn://module1 module1 cd module1 svn delete bar svn propset svn:externals "^/module2 bar" .

now want update working directory can perform build & test new code before committing.

however, svn update result in following error:

fetching external item 'module1/bar' svn: warning: working copy 'module1/bar' locked

i tried svn cleanup in each directory, subsequent update still failed same error.

is because i'm trying replace directory external same name, in same commit? want possible?

i using svn 1.8.

yes, cause. directory being locked deletion @ same time external's contents trying spawn @ same location.

you can working directory committable state updating without externals:

svn update --ignore-externals

that prevents incoming bar external conflicting outgoing directory. however, of course, means external's contents won't present. able commit now, you'll potentially stuck broken revision in svn rest of time because cannot build & test first.

there hacky way around not ideal @ least give idea of whether new code working. involves moving folders around in working directory:

svn propset svn:externals "^/module2 bar_tmp" . svn update rm -rf bar mv bar_tmp bar

now can build & test reasonable guarantee you're testing committing, although unorthodox.

your working directory structure this:

~/ ├ module1/ │ ├ foo/ │ ├ bar/    (external "^/module2") │ ├ baz/

don't svn update! you've [deliberately] butchered working directory extent , less svn knows better. don't need svn build & test.

when you're done , happy, though, need put things way were:

svn propset svn:externals "^/module2 bar" . rm -rf bar svn update --ignore-externals

and commit.


Comments

Post a Comment

Popular posts from this blog

c++ - Difference between pre and post decrement in recursive function argument -

i have following sample code used pre-decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(--c); cout << c << endl; return; } } this function give output input 4 : dp3 dp2 dp1 dp0 0 1 2 3 but when use post decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(c--); cout << c << endl; return; } } output goes in infinite loop dp4 can explain me in detail why happens ? this happens because function(c--) called same value of c , when finishes c decremented. recursively called, hence called same value no chance of return , hit stack overflow error. assume this, int x = 1, y = 0; y = x++ result y == 1 , x == 2. if y = ++x , bot x , y 2.
Read more

php - Nothing but 'run(); ' when browsing to my local project, how do I fix this? -

i added new project. made mistake in projectname.conf file in sites-available apache2, led me reinstalling apache2. after reinstalling , re-enabling projects on every page of every project .. <body> run(); </body> .. i've run composer update, restarted service, restarted pc, checked config files, tried disabling new project. there nothing in error log, , access.log: 127.0.0.1 - - [15/may/2015:01:40:47 +0200] "get / http/1.1" 304 181 "-" "mozilla/5.0 (x11; ubuntu; linux x86_64; rv:38.0) gecko/20100101 firefox/38.0" maybe i'm forgetting apache2 reinstall? don't think did different last time installed it. looks haven't setup php correctly. take @ this great guide , maybe you're forgetting link php config apache2.
Read more

php - How can I echo out this array? -

i don't know how go grabbing data in variable , put foreach loop. class tree{ private $info = array( array('name'=>'jim','state'=>'nu','company'=>'nu','phone'=>array('cell'=>'5615111111','office'=>'5611111111'),'email'=>array('primary'=>'exs@example.com','ex@there.com')), array('name'=>'joe smith','city'=>'phoenix','phone'=>'4805551111','email'=>'jsmith@some_email.com'), array('name'=>'john doe','city'=>'chandler','company'=>'doe co.','email'=>array('jdoe@gmail.com','personal'=>'email@email.com'),'phone'=>'6025550002') ); } if you're inside of class, can access private variable using $this->variablename . example, i
Read more