version control - What happened after svn switch and how to commit local changes? -


i made changes in code , after decided code not trunk, should rather experiment bit (with code) , later if succeed should go trunk.

so needed create branch -- created new directory in branches, copied svn copy trunk newly created branch, , went source code directory , executed svn switch.

and @ point don't understand happened. svn traversed entire directory in similar fashion when apply svn status, putting file a letter directories c, in summary read:

updated revision 1458. summary of conflicts: tree conflicts: 6

but when checked files saw files (luckily) not updated svn repository (once again, after last commit made changes code , then decided branch).

when issue svn status can see many entries info directory:

a  +  c testsuite       >   local edit, incoming delete upon switch

the steps made read on so, , there not mentioned such problems. how can commit changes branch (of course don't want delete changes).

update: found partial answer on so, can execute:

svn resolve --accept working ./*

to claim local version files ok. see: https://stackoverflow.com/a/2207119/210342

but not over, has error:

svn: did not expect '/media/wdisk/projekty/myproject /myproject.unittests/metadata' working copy root

update 2: didn't solve like. instead copied entire directory (local one), removed .snv directories, checked out files branch, copied local files over, , committed. seen svn regular change, didn't trigger conflicts.

since working copying containing local modification want commit after testing them in seprate branch ( feature branch - branching startergy :) ) , on running svn switch command getting response similar when run svn update, svn switch compares working copy giving response changes in c (conflict state ) , newly added (a).

the same senerios described on :

http://svnbook.red-bean.com/en/1.6/svn.branchmerge.switchwc.html

have ever found making complex edits (in /trunk working copy) , realized, “hey, these changes ought in own branch?” great >technique can summarized in 2 steps:

$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/newbranch \
-m "create branch 'newbranch'."

committed revision 353.

$ svn switch ^/calc/branches/newbranch

at revision 353.

the svn switch command, svn update, preserves local edits. @ point, working copy reflection of newly created branch, , next svn commit invocation send changes there.

hope helps!!

jyotsna


Comments

Post a Comment

Popular posts from this blog

android - Get AccessToken using signpost OAuth without opening a browser (Two legged Oauth) -

i using signpost oauth access data magento server. have read various tutorials on same , reach point open browser user can enter credentials. however, per requirement have automate part. hence, user should not browser page. have set-up done on server side ( magento ), hit url , returned call page. same through program in android. i have tried below, consumer = new commonshttpoauthconsumer(key, secret); provider = new commonshttpoauthprovider(oauth_init_url,access_token_url, authorize_url); try { provider.retrieverequesttoken(consumer, oauth.out_of_band); log.d("tokens" , consumer.gettoken() + " -- " + consumer.gettokensecret()); } and request tokens. dont know how bypass next step. tried directly accessing accesstoken (stupid of me) provider.retrieveaccesstoken(consumer, "mycallback://callback"); no luck, ends in oauth.signpost.exception.oauthnotauthorizedexception: authorization failed (server replied 401). ...
Read more

org.mockito.exceptions.misusing.InvalidUseOfMatchersException: mockito -

getting error org.mockito.exceptions.misusing.invaliduseofmatchersexception: invalid use of argument matchers! 1 matchers expected, 2 recorded. exception may occur if matchers combined raw values: //incorrect: somemethod(anyobject(), "raw string"); when using matchers, arguments have provided matchers. example: //correct: somemethod(anyobject(), eq("string matcher")); at when( getprogramservice .callservice(any(getprogramtype.class))) .thenreturn(jaxbresponse); please explain error , possible resolution the code posted looks fine; don't see problem it. code before or above causing exception. key here: invalid use of argument matchers! 1 matchers expected, 2 recorded. any , used above, doesn't return "special kind of null" or "special kind of getprogramtype"; don't exist. instead, returns null , side effect puts matcher on stack. whe...
Read more

google shop client API returns 400 bad request error while adding an item -

i'm working on solution add items in google shopping market java application. following tutorial real mess because of missing classes of laste release, after setting 1.5-beta maven managed make base example typecheck correctly classes. still can make simple task of adding 1 item. instead of posting whole code i'm posting part creates product feed. private product createproduct(string id) { product product = new product(); product.title = "red wool sweater"; product.content = new content( "text", "comfortable , soft, sweater keep warm on " + "cold winter nights. red , blue stripes."); product.appcontrol = new appcontrol(); product.appcontrol.addrequireddestination("productads"); product.externalid = id; product.lang = "it"; product.country = "it"; product.condition = "nuovo"; product.price = new price("eu...
Read more