fix merge

diff --git a/DataObjects/Mtrack_change.php b/DataObjects/Mtrack_change.php
index ac1c04a..55ac511 100644 (file)
--- a/DataObjects/Mtrack_change.php
+++ b/DataObjects/Mtrack_change.php
@@ -763,7 +763,8 @@ class Pman_MTrack_DataObjects_Mtrack_change extends DB_DataObject
         foreach ($this->audit() as $a) {
             $str[] = $a->toAuditString($this);
         }
-        
+ 
+ 
         // who to send to..
         $d = DB_DataObject::factory('core_person');
         $d->whereAddIn('id', array($t->created_person_id, $t->developer_id), 'int');
@@ -785,7 +786,7 @@ class Pman_MTrack_DataObjects_Mtrack_change extends DB_DataObject
             ))->send();
         }
         
-        //print_R($res); 
+         //print_R($res); 
     }
 
     

diff --git a/DataObjects/Mtrack_repos.php b/DataObjects/Mtrack_repos.php
index daa5a8f..6304787 100644 (file)
--- a/DataObjects/Mtrack_repos.php
+++ b/DataObjects/Mtrack_repos.php
@@ -453,6 +453,10 @@ class Pman_MTrack_DataObjects_Mtrack_repos extends DB_DataObject
         if ($b->find(true)) {
             return $b;
         }
+        if (preg_match("/_T([0-9]+)_/",$n, $matches)) {
+            $b->ticket_id = $matches[1];
+        }
+        
         $b->insert();
         return $b;
     }

diff --git a/sql/mtrack_repos_branch.sql b/sql/mtrack_repos_branch.sql
index b85ef62..7cbc74b 100644 (file)
--- a/sql/mtrack_repos_branch.sql
+++ b/sql/mtrack_repos_branch.sql
@@ -4,6 +4,9 @@ CREATE TABLE mtrack_repos_branch (
   repo_id INT(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (id)
 ) ;
+
+ ALTER TABLE mtrack_repos_branch ADD COLUMN ticket_id INT  NOT NULL DEFAULT 0;
+
 ALTER TABLE mtrack_repos_branch ADD INDEX plookup(repo_id,name);
 
  ALTER TABLE mtrack_repos_branch CHANGE COLUMN name name  VARCHAR(128) NOT NULL DEFAULT '';