On Mon, Oct 04, 2010 at 04:09:39PM -0700, Saftoiu, Rares wrote: > Here is my scenario: > > I just did a merge, and I have a bunch of tree-conflicts and a bunch > of non-tree conflicts. For most of these conflicts, I can resolve them > by accepting theirs-full. However, tree conflicts can only be resolved > to working.
The important part is "can only be resolved to working". > I run the following command: > > svn status | egrep "^[[:space:]]*C" > > And I get: > > C Common.war/commerce/emailtemplates/email_qbunlock_addemail.jsp > C Common.war/commerce/common/fragments/popup/popup_body_questions.jsp > C Common.war/commerce/catalog/unlock.jsp > C Common.war/bat/verifyBuild.jsp > C Common.war/sbweb/common/css/contexts/mobile/min/home-min.css > C Common.war/sbweb/common/css/contexts/corporate/splashWireframe.css > C Common.war/sbweb/common/css/contexts/corporate/splashWireframeIE6.css > C Common.war/sbweb/common/images/sprites/ui/wireframe_asset_570x570.png > C Common.war/sbweb/common/images/sprites/ui/quickTour_1070x221.png > C > Common.war/sbweb/common/images/hero/intm_hero_wireframe_background_1001x322.png > C Common.war/sbweb/common/images/backgrounds/right_rail_top.jpg > C Common.war/sbweb/common/images/backgrounds/right_rail_bottom.jpg > > Then I run: > > svn resolve -R --accept=theirs-full * ... therefore, "svn resolve" will only resolve tree conflicts if you pass "--accept=working". > > And then, when I do a grep for all the conflicted files again: > > $ svn status | egrep "^[[:space:]]*C" > C Common.war/commerce/emailtemplates/email_qbunlock_addemail.jsp > C Common.war/commerce/common/fragments/popup/popup_body_questions.jsp > C Common.war/commerce/catalog/unlock.jsp > C Common.war/bat/verifyBuild.jsp > C Common.war/sbweb/common/css/contexts/mobile/min/home-min.css > C Common.war/sbweb/common/css/contexts/corporate/splashWireframe.css > C Common.war/sbweb/common/css/contexts/corporate/splashWireframeIE6.css > C Common.war/sbweb/common/images/sprites/ui/wireframe_asset_570x570.png > C Common.war/sbweb/common/images/sprites/ui/quickTour_1070x221.png > C > Common.war/sbweb/common/images/hero/intm_hero_wireframe_background_1001x322.png > C Common.war/sbweb/common/images/backgrounds/right_rail_top.jpg > C Common.war/sbweb/common/images/backgrounds/right_rail_bottom.jpg > > If I do a status, the first conflict is a tree one: > > C Common.war/commerce/emailtemplates/email_qbunlock_addemail.jsp > > local add, incoming add upon merge > > And the second is a text one: > > C Common.war/commerce/common/fragments/popup/popup_body_questions.jsp Does "svn resolve --accept=theirs-full" for this file work? Tino. -- "What we nourish flourishes." - "Was wir nähren erblüht." www.tisc.de
