Merge branch 'dev' into sync

agateau · Jan 6, 2017 · 735263e · 735263e
2 parents 36d16c7 + 9930d7d
commit 735263e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,8 @@
+v1.x.y unreleased
+
+- New features:
+    - A new command has been added: `p_merge`, to merge a project into another.
+
 v1.1.1 2016/11/11
 
 - Improvements:

diff --git a/yokadi/ycli/projectcmd.py b/yokadi/ycli/projectcmd.py
@@ -139,6 +139,7 @@ def parser_p_merge(self):
         return parser
 
     def do_p_merge(self, line):
+        raise Exception("Broken for now, going to fix it")
         session = db.getSession()
         parser = self.parser_p_merge()
         args = parser.parse_args(line)