summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-02-20 18:34:46 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-03-05 17:15:08 (GMT)
commitd8532bc2f93a80b5be8701955e668787be41ac3e (patch)
tree3135e228e7281a4a473abdfc2f2ce1b4435d64fd
parent5ce7b18b7ebc9c2fb6c431424646ed0dad0f1215 (diff)
downloadtbdiff-d8532bc2f93a80b5be8701955e668787be41ac3e.tar.gz
Fix error in the baserock-system-config-sync behaviour table.
When one file is present in v1 and in vUser, and is not present in v2, baserock-system-config-sync copies vUser version of the file. This was happening before this commit, but it was wrong explained in the behaviour table.
-rwxr-xr-xbaserock-system-config-sync/baserock-system-config-sync4
1 files changed, 2 insertions, 2 deletions
diff --git a/baserock-system-config-sync/baserock-system-config-sync b/baserock-system-config-sync/baserock-system-config-sync
index a1a4a85..f21f898 100755
--- a/baserock-system-config-sync/baserock-system-config-sync
+++ b/baserock-system-config-sync/baserock-system-config-sync
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2013 Codethink Ltd.
+# Copyright (c) 2013-2014 Codethink Ltd.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License Version 2 as
@@ -127,7 +127,7 @@ merge_regular_file() {
# none exists none use Vuser
# none none exists use V2
# exists none exists use V2
- # exists exists none use V2
+ # exists exists none use Vuser
# none exists exists diff V2 Vuser applied to V2
# exists exists exists diff V1 Vuser applied to V2