From 6dba98cc1a7cfc476ee9a10f8e30510d8085410a Mon Sep 17 00:00:00 2001 From: sklum Date: Sat, 5 Apr 2014 10:56:31 -0700 Subject: [PATCH] Fork no longer overwrites modifcations to metadata after branches --- openbr/plugins/meta.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openbr/plugins/meta.cpp b/openbr/plugins/meta.cpp index c713c98..898cafb 100644 --- a/openbr/plugins/meta.cpp +++ b/openbr/plugins/meta.cpp @@ -317,6 +317,7 @@ class ForkTransform : public CompositeTransform // same as _project, but calls projectUpdate on sub-transforms void projectupdate(const Template & src, Template & dst) { + qDebug() << "In projectupdate..."; foreach (Transform *f, transforms) { try { Template res; @@ -332,8 +333,8 @@ class ForkTransform : public CompositeTransform void projectUpdate(const TemplateList & src, TemplateList & dst) { + qDebug() << "In projectUpdate..."; dst.reserve(src.size()); - for (int i=0; iprojectUpdate(src, m); @@ -375,6 +376,7 @@ protected: // Apply each transform to src, concatenate the results void _project(const Template &src, Template &dst) const { + qDebug() << "In _project..."; foreach (const Transform *f, transforms) { try { dst.merge((*f)(src)); @@ -388,8 +390,9 @@ protected: void _project(const TemplateList &src, TemplateList &dst) const { + qDebug() << "In _project TemplateList..."; dst.reserve(src.size()); - for (int i=0; iproject(src, m); -- libgit2 0.21.4