diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-20 15:48:01 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-20 15:48:01 +0000 |
| commit | bcfb17b890e74538655695c4f76962b16565f664 (patch) | |
| tree | 0d89f7495dd2704d28d9d090f261c352a2675e02 /baserock-system-config-sync/baserock-system-config-sync | |
| parent | 20e5304f40148d43c6ab57dea0abe400475e7e9f (diff) | |
| parent | d71ff3eaa4a55b32659e165efe4b78149ef240cb (diff) | |
| download | tbdiff-bcfb17b890e74538655695c4f76962b16565f664.tar.gz | |
Merge branch 'baserock/pedroalvarez/bscs-upgrade-tests3'
Reviewed-by: Richard Maw
Reviewed-by: Sam Thursfield
Diffstat (limited to 'baserock-system-config-sync/baserock-system-config-sync')
| -rwxr-xr-x | baserock-system-config-sync/baserock-system-config-sync | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/baserock-system-config-sync/baserock-system-config-sync b/baserock-system-config-sync/baserock-system-config-sync index cb5984d..a093b15 100755 --- a/baserock-system-config-sync/baserock-system-config-sync +++ b/baserock-system-config-sync/baserock-system-config-sync @@ -151,13 +151,17 @@ merge_regular_file() { cp -a "$vu" "$vt" ;; 'none exists exists') - if ! (diff -u "$v2" --label="$v2" "$vu" --label="$vu" | patch "$v2" -t -o "$vt"); then + cp -a "$v2" "$vt" + if ! (diff -u "$v2" --label="$v2" "$vu" --label="$vu" | patch "$vt" -t); then cp -a "$v2" "$vt" # merge failed, use v2 + # 'patch' creates a file '.rej' with the diff that did not apply fi ;; 'exists exists exists') - if ! (diff -u "$v1" --label="$v1" "$vu" --label="$vu" | patch "$v2" -t -o "$vt"); then + cp -a "$v2" "$vt" + if ! (diff -u "$v1" --label="$v1" "$vu" --label="$vu" | patch "$vt" -t); then cp -a "$v2" "$vt" # merge failed, use v2 + # 'patch' creates a file '.rej' with the diff that did not apply fi ;; *) |