Changes between Version 1 and Version 2 of Obsolete/Development/Templates/RepUpdate

Timestamp:

Jul 19, 2006, 10:31:42 AM (18 years ago)

Author:

/C=FR/O=CNRS/OU=UMR8607/CN=Michel Jouvin/emailAddress=jouvin@…

Comment:

--

Obsolete/Development/Templates/RepUpdate

@@ -17 +17 @@
 You need to fix manually the unexpected differences. Unexpected differences are all the templates that existed in the repository but no longer exist in the local workspace or all the templates copied from the source but not registered in the repository. There are 3 situations :
  * A template has been renamed or moved. In this case, you should revert the change for this template, do the relevant `svn mv` and rerun `directory_sync` to avoid breaking the template modification history.
+ * Else, if the template existed in the repository but is no longer present in the workspace (flagged `!` by `svn status`), it can be safely removed from the repository with command :
+{{{
+svn rm --force template_name.tpl
+}}}
+ * Else, if the template is present in the workspace but not registered into the repository ((flagged `?` by `svn status`) and this is a new template, it should be added to the repository with command :
+{{{
+svn add template_name.tpl
+}}}
+
+When you have cleaned up the situation for all the templates, except those that are present in the workspace (because they are used in your local Quattor configuration) but don't need to be in the repository, you can do the final cleanup with :
+{{{
+rm `svn status | grep '^\?' | awk '{print $2}'`
+}}}
+
+When there is no more templates flagged as `!` (missing) or `?` (unknown), you can commit your changes to the repository. Please, take care of setting up a useful message for the commit as this is the only source for a ChangeLog...
+
+After committing your changes, if you think they are worth a new 'release', refer to the documentation about [wiki:Development/RelTagging] tagging] a new release.
+