From a0f2079fb564b14555f21e15cf38080b695f3be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 25 Jun 2015 11:00:14 +0200 Subject: [PATCH] maintenance branch is 1.2.1-dev for now This branch is for preparing the next patch-releases of the current stable release on the master branch. --- .versioneer-lookup | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.versioneer-lookup b/.versioneer-lookup index 8e1218d7..6f4c4d68 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -7,12 +7,13 @@ # The file is processed from top to bottom, the first matching line wins. If or are left out, # the lookup table does not apply to the matched branches -# master and staging shall not use the lookup table +# master shall not use the lookup table, only tags master -staging -# fix/ branches are fixes for master, so we don't handle those either -fix/.* +# maintenance is currently the branch for preparation of maintenance release 1.2.1 +# so are any fix/... branches +maintenance 1.2.1-dev cfa4cb2a7c5f1af10dc8 +fix/.* 1.2.1-dev cfa4cb2a7c5f1af10dc8 # every other branch is a development branch and thus gets resolved to 1.2.0-dev for now .* 1.2.0-dev 50cf776e70b9