Differences

This shows you the differences between two versions of the page.

--- dev:sqitch [2016/03/30 11:01] – erickson
+++ dev:sqitch [2022/02/10 13:34] (current) – external edit 127.0.0.1
@@ Line 1: / Line 1: @@
-==== Using Sqitch with Evergreen ====
+===== Using Sqitch with Evergreen =====
 See also[[https://bugs.launchpad.net/evergreen/+bug/1521693|Launchpad Bug 1521693]]
-=== Getting Started ===
+==== Getting Started ====
-== Install Sqitch ==
+=== Install Sqitch ===
 <code>
@@ Line 13: / Line 13: @@
 </code>
-== Install Base Schema ==
+=== Install Base Schema ===
 Install the latest working branch from LP 1521693 using the standard DB install process.  The branch is set up to use Sqitch internally.  No special considerations are required for the base install.
-=== Creating an Upgrade Script ===
+==== Creating an Upgrade Script ====
 For this example, we're cross-porting an existing SQL upgrade script for LP #1319998.
@@ Line 51: / Line 51: @@
 For example, see the contents of these 3 files at [[http://git.evergreen-ils.org/?p=working/Evergreen.git;a=commitdiff;h=c999d04|commit c999d04]].
-=== Deploying an Upgrade Script ===
+==== Deploying an Upgrade Script ====
   * Sanity check the status first
@@ Line 87: / Line 87: @@
 </code>
-=== Resolving Conflicts / Developing With Multiple Branches ===
+==== Resolving Conflicts / Deploying Multiple Plan Files ====
 **AKA "Cannot find this change in sqitch.plan"**
@@ Line 122: / Line 122: @@
 The **--log-only** option tells Sqitch to update its tracking tables without executing any deploy/verify/revert scripts.  This is particularly useful when bouncing between branches where you may not want to revert changes, because it means deleting test data.
-==== Example =====
+=== Example ===
   - Deploy sqitch.plan with changes A, B, and C.
@@ Line 142: / Line 142: @@
 The same steps will work when returning to the original branch w/ changes A, B, and C.
+=== The --merge option ===
+Version 1.1.0 of Sqitch [[https://github.com/theory/sqitch/issues/200|will support]] a --merge option to better handle situations where the plan file does not match the exact order of the events tracked in the Sqitch database.  (At time of writing, CPAN installs version 0.9994).  In theory, this will make it easier to use a single database for developing across multiple branches.