Commit 6dba98cc1a7cfc476ee9a10f8e30510d8085410a

Authored by sklum
1 parent 9628df78

Fork no longer overwrites modifcations to metadata after branches

Showing 1 changed file with 5 additions and 2 deletions
openbr/plugins/meta.cpp
@@ -317,6 +317,7 @@ class ForkTransform : public CompositeTransform @@ -317,6 +317,7 @@ class ForkTransform : public CompositeTransform
317 // same as _project, but calls projectUpdate on sub-transforms 317 // same as _project, but calls projectUpdate on sub-transforms
318 void projectupdate(const Template & src, Template & dst) 318 void projectupdate(const Template & src, Template & dst)
319 { 319 {
  320 + qDebug() << "In projectupdate...";
320 foreach (Transform *f, transforms) { 321 foreach (Transform *f, transforms) {
321 try { 322 try {
322 Template res; 323 Template res;
@@ -332,8 +333,8 @@ class ForkTransform : public CompositeTransform @@ -332,8 +333,8 @@ class ForkTransform : public CompositeTransform
332 333
333 void projectUpdate(const TemplateList & src, TemplateList & dst) 334 void projectUpdate(const TemplateList & src, TemplateList & dst)
334 { 335 {
  336 + qDebug() << "In projectUpdate...";
335 dst.reserve(src.size()); 337 dst.reserve(src.size());
336 - for (int i=0; i<src.size(); i++) dst.append(Template(src[i].file));  
337 foreach (Transform *f, transforms) { 338 foreach (Transform *f, transforms) {
338 TemplateList m; 339 TemplateList m;
339 f->projectUpdate(src, m); 340 f->projectUpdate(src, m);
@@ -375,6 +376,7 @@ protected: @@ -375,6 +376,7 @@ protected:
375 // Apply each transform to src, concatenate the results 376 // Apply each transform to src, concatenate the results
376 void _project(const Template &src, Template &dst) const 377 void _project(const Template &src, Template &dst) const
377 { 378 {
  379 + qDebug() << "In _project...";
378 foreach (const Transform *f, transforms) { 380 foreach (const Transform *f, transforms) {
379 try { 381 try {
380 dst.merge((*f)(src)); 382 dst.merge((*f)(src));
@@ -388,8 +390,9 @@ protected: @@ -388,8 +390,9 @@ protected:
388 390
389 void _project(const TemplateList &src, TemplateList &dst) const 391 void _project(const TemplateList &src, TemplateList &dst) const
390 { 392 {
  393 + qDebug() << "In _project TemplateList...";
391 dst.reserve(src.size()); 394 dst.reserve(src.size());
392 - for (int i=0; i<src.size(); i++) dst.append(Template(src[i].file)); 395 + for (int i=0; i<src.size(); i++) dst.append(Template());
393 foreach (const Transform *f, transforms) { 396 foreach (const Transform *f, transforms) {
394 TemplateList m; 397 TemplateList m;
395 f->project(src, m); 398 f->project(src, m);