diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-11-20 18:58:30 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-11-20 18:58:30 -0500 |
| commit | 22bc8c4f0eafbafd917caea044a02dfe2495bca7 (patch) | |
| tree | d6c7b7823bbf97bdb9239bec169b6d60bb6ebd2d | |
| parent | 41f4fbbe350008aac67532641e8eba6b7dc16cd0 (diff) | |
| download | alembic-22bc8c4f0eafbafd917caea044a02dfe2495bca7.tar.gz | |
make the three way merge thing a separate section, we don't really
even need it but should be fine
| -rw-r--r-- | docs/build/tutorial.rst | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/docs/build/tutorial.rst b/docs/build/tutorial.rst index 7b7f256..5787e08 100644 --- a/docs/build/tutorial.rst +++ b/docs/build/tutorial.rst @@ -1929,19 +1929,6 @@ from the base using ``history -r networking@base:``:: Note this is the same output we'd get at this point if we used ``-r :networking@head``. - -We have quite a lot of versioning going on, history overall now shows:: - - $ alembic history - 109ec7d132bf -> 29f859a13ea (networking) (head), add DNS table - 3782d9986ced -> 109ec7d132bf (networking), add ip number table - <base> -> 3782d9986ced (networking), create networking branch - ae1027a6acf -> 55af2cb1c267 (head), add another account column - 1975ea83b712 -> ae1027a6acf, add a column - 27c6a30d7c24 -> d747a8a8879 (shoppingcart) (head), add a shopping cart column - 1975ea83b712 -> 27c6a30d7c24 (shoppingcart), add shopping cart table - <base> -> 1975ea83b712 (branchpoint), add account table - We may now run upgrades or downgrades freely, among individual branches (let's assume a clean database again):: @@ -1959,6 +1946,22 @@ or against the whole thing using ``heads``:: INFO [alembic.migration] Running upgrade 1975ea83b712 -> ae1027a6acf, add a column INFO [alembic.migration] Running upgrade ae1027a6acf -> 55af2cb1c267, add another account column +Branch and Merge Nuttiness +-------------------------- + +We have quite a lot of versioning going on, history overall now shows:: + + $ alembic history + 109ec7d132bf -> 29f859a13ea (networking) (head), add DNS table + 3782d9986ced -> 109ec7d132bf (networking), add ip number table + <base> -> 3782d9986ced (networking), create networking branch + ae1027a6acf -> 55af2cb1c267 (head), add another account column + 1975ea83b712 -> ae1027a6acf, add a column + 27c6a30d7c24 -> d747a8a8879 (shoppingcart) (head), add a shopping cart column + 1975ea83b712 -> 27c6a30d7c24 (shoppingcart), add shopping cart table + <base> -> 1975ea83b712 (branchpoint), add account table + + If you actually wanted, all three branches can be merged:: $ alembic merge -m "merge all three branches" heads |