Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

MINOR Auto conflict merges in phing translation tasks

Also set some default values when targets are executed
individually, and ensure that text collection fails the build if required
  • Loading branch information...
commit 5cad54578cd0bd33d8c61cf40b74d41122449c35 1 parent 6dfd99a
Ingo Schommer authored June 25, 2012

Showing 1 changed file with 8 additions and 5 deletions. Show diff stats Hide diff stats

  1. 13  build.xml
13  build.xml
@@ -408,13 +408,16 @@ Your friendly automated release script.
408 408
 	<target name="translations-staging-setup">
409 409
 		<propertyprompt propertyName="module" 
410 410
 			promptText="Module name?"
411  
-			useExistingValue="true" />
  411
+			useExistingValue="true"
  412
+			defaultValue="framework" />
412 413
 		<propertyprompt propertyName="getlocalization.${module}.project" 
413 414
 			promptText="getlocalization project"
414  
-			useExistingValue="true" />
  415
+			useExistingValue="true"
  416
+			defaultValue="sapphire" />
415 417
 		<propertyprompt propertyName="getlocalization.${module}.user" 
416 418
 			promptText="getlocalization username"
417  
-			useExistingValue="true" />
  419
+			useExistingValue="true"
  420
+			defaultValue="silverstripe" />
418 421
 		<propertyprompt propertyName="getlocalization.${module}.password" 
419 422
 			promptText="getlocalization password"
420 423
 			useExistingValue="true" />
@@ -432,8 +435,8 @@ Your friendly automated release script.
432 435
 	<target name="translations-update-git-masterfile" 
433 436
 		description="Collect translation on a module, commit them into a specialized branch and push to the origin repository."
434 437
 		depends="translations-staging-setup">
435  
-		<exec command="git merge origin/master" dir="${module}" checkreturn="true" />
436  
-		<exec command="php framework/cli-script.php dev/tasks/i18nTextCollectorTask" passthru="true" />		
  438
+		<exec command="git merge --strategy recursive -X theirs origin/master" dir="${module}" checkreturn="true" />
  439
+		<exec command="php framework/cli-script.php dev/tasks/i18nTextCollectorTask" passthru="true" checkreturn="true" />		
437 440
 		<exec command="git status --short" dir="${module}" outputProperty="git.status.${module}" />
438 441
 		<if>
439 442
 			<istrue value="${git.status.${module}}" />

0 notes on commit 5cad545

Please sign in to comment.
Something went wrong with that request. Please try again.