meld - invoking 'patch failed



Hi,



I am using meld and gote th invoking 'patch failed   message
Details:

meld version:     1.3.0
source control    Subversion,    version 1.6.6 (r40053)


output of svn diff

Index: thermomech_mbal.F90
===================================================================
--- thermomech_mbal.F90 (revision 511)
+++ thermomech_mbal.F90 (working copy)
@@ -9,9 +9,9 @@
 contains
 
   subroutine mass_balance_mm(nmsb,dx,dy,n,m)  
+!openad XXX Template ad_template.joint.f
+   implicit none
 
-    implicit none
-
     ! Dummy arguments
     integer,                intent(in)  :: n,m                   ! Number of grids
     real(dp),dimension(n,m),intent(out) :: nmsb                  ! Surface mass balance
@@ -36,6 +36,7 @@
   !#################################################################################################
 
   subroutine distance(d,xs,ys,dx,dy,n,m)
+!openad XXX Template ad_template.joint.f
 
     implicit none


- patch command

 'patch --strip=0 --reverse --directory=/home/research/ggmcgovern/simple-ice-checkouts/simple-ice-tmp/thermomech/tmphTUylz-meld'




Thanks,

Jonathan










[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]