[cig-commits] r21833 - seismo/3D/SPECFEM3D/branches/coupling_vadim

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2013-04-11 18:38:55 -0700 (Thu, 11 Apr 2013)
New Revision: 21833

Added:
   seismo/3D/SPECFEM3D/branches/coupling_vadim/very_important_before_making_any_change_merge_modifs_from_trunk_into_your_branch_with_commit.csh
   seismo/3D/SPECFEM3D/branches/coupling_vadim/very_important_before_making_any_change_merge_modifs_from_trunk_into_your_branch_without_commit.csh
Log:
added coupling_vadim/very_important_before_making_any_change_merge_modifs_from_trunk_into_your_branch_without_commit.csh


Added: seismo/3D/SPECFEM3D/branches/coupling_vadim/very_important_before_making_any_change_merge_modifs_from_trunk_into_your_branch_with_commit.csh
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/very_important_before_making_any_change_merge_modifs_from_trunk_into_your_branch_with_commit.csh	                        (rev 0)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/very_important_before_making_any_change_merge_modifs_from_trunk_into_your_branch_with_commit.csh	2013-04-12 01:38:55 UTC (rev 21833)
@@ -0,0 +1,20 @@
+#!/bin/csh
+
+# update the trunk
+pushd ../../trunk/
+svn update
+popd
+
+# update my branch (in case other people have made changes to it)
+svn update
+
+# merge all the recent changes made in the trunk into my branch
+# (this branch was created from revision r21712, and "HEAD" indicates the current revision of the trunk
+## DK DK
+## DK DK  answer 'tc' in case of a detected conflict:   (tc) theirs-conflict  - accept their version for all conflicts
+## DK DK
+svn merge ../../trunk -r21712:HEAD
+
+# commit the merge
+svn commit -m "merged the trunk into Vadim's branch"
+


Property changes on: seismo/3D/SPECFEM3D/branches/coupling_vadim/very_important_before_making_any_change_merge_modifs_from_trunk_into_your_branch_with_commit.csh
___________________________________________________________________
Name: svn:executable
   + *

Added: seismo/3D/SPECFEM3D/branches/coupling_vadim/very_important_before_making_any_change_merge_modifs_from_trunk_into_your_branch_without_commit.csh
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/very_important_before_making_any_change_merge_modifs_from_trunk_into_your_branch_without_commit.csh	                        (rev 0)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/very_important_before_making_any_change_merge_modifs_from_trunk_into_your_branch_without_commit.csh	2013-04-12 01:38:55 UTC (rev 21833)
@@ -0,0 +1,20 @@
+#!/bin/csh
+
+# update the trunk
+pushd ../../trunk/
+svn update
+popd
+
+# update my branch (in case other people have made changes to it)
+svn update
+
+# merge all the recent changes made in the trunk into my branch
+# (this branch was created from revision r21712, and "HEAD" indicates the current revision of the trunk
+## DK DK
+## DK DK  answer 'tc' in case of a detected conflict:   (tc) theirs-conflict  - accept their version for all conflicts
+## DK DK
+svn merge ../../trunk -r21712:HEAD
+
+# commit the merge
+####svn commit -m "merged the trunk into Vadim's branch"
+


Property changes on: seismo/3D/SPECFEM3D/branches/coupling_vadim/very_important_before_making_any_change_merge_modifs_from_trunk_into_your_branch_without_commit.csh
___________________________________________________________________
Name: svn:executable
   + *