subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Saftoiu, Rares" <Rares_Saft...@intuit.com>
Subject svn resolve -R broken?
Date Mon, 04 Oct 2010 23:09:39 GMT
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.

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 *

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

I was expecting the -R option to make resolve run through and resolve everything that it can,
but this seems to not be happening.

Let me know if you need more info,
--
Rareș Săftoiu | Sr. Software Engineer | CG webteam | Intuit Inc. | Office: (858) 215-8979
| Mobile: (917) 306-8360




Mime
View raw message