[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkde-ruleset/global-merges=5D_kdeedu=3A_Export_kde4?=
From:       Nicolás_Alvarez <nicolas.alvarez () gmail ! com>
Date:       2011-04-01 1:53:52
Message-ID: 20110401015352.4CE0FA609B () git ! kde ! org
[Download RAW message or body]

Git commit d263032191da94e3dcdcb7273d060bec016bd35e by Nicolás Alvarez.
Committed on 01/04/2011 at 03:53.
Pushed by nalvarez into branch 'global-merges'.

Export kde4_jobflags branch, and synth merge in kstars.

KStars is the only repository affected by this branch.

M  +9    -0    kdeedu/feature-branches     
M  +6    -0    kdeedu/kstars-parentmap     

http://commits.kde.org/kde-ruleset/d263032191da94e3dcdcb7273d060bec016bd35e

diff --git a/kdeedu/feature-branches b/kdeedu/feature-branches
index 6d8cb86..d14f3e2 100644
--- a/kdeedu/feature-branches
+++ b/kdeedu/feature-branches
@@ -65,4 +65,13 @@ match /branches/work/kde4-qdbus-api-changes/${MODULE}/
     max revision 575850 # branch deleted in r575851
 end match
 
+match /branches/work/kde4_jobflags/KDE/${MODULE_RECURSE}$
+    action recurse
+end match
+match /branches/work/kde4_jobflags/KDE/${MODULE}/
+    repository ${REPO}
+    branch kde4_jobflags
+    max revision 721454 # branch deleted in r721455
+end match
+
 # kate: hl svn2git rules; indent-mode svn2git;
diff --git a/kdeedu/kstars-parentmap b/kdeedu/kstars-parentmap
index 4b30bdb..9ba35b1 100644
--- a/kdeedu/kstars-parentmap
+++ b/kdeedu/kstars-parentmap
@@ -36,3 +36,9 @@ clear 699589
 
 # merge kconfiggroup_port branch into trunk
 633602 635473
+
+# intermediate merge from trunk to kde4_jobflags
+720993 721065
+
+# merge kde4_jobflags into trunk
+721065 721447

[prev in list] [next in list] [prev in thread] [next in thread]