[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_Global_branc?=
From: Nicolás_Alvarez <nicolas.alvarez () gmail ! com>
Date: 2011-03-31 23:35:33
Message-ID: 20110331233533.BD2A1A60AE () git ! kde ! org
[Download RAW message or body]
Git commit 474cecbe3ced8e9ee2c509470db9aab7c71196b8 by Nicolás Alvarez.
Committed on 01/04/2011 at 00:37.
Pushed by nalvarez into branch 'global-merges'.
Global branches for parley.
Currently only kconfig_new_take3. Still missing kde4_jobflags
and kde4_kconfig, and branches from when it was called kvoctrain.
M +5 -0 kdeedu/parley-parentmap
M +2 -0 kdeedu/parley-rules
http://commits.kde.org/kde-ruleset/474cecbe3ced8e9ee2c509470db9aab7c71196b8
diff --git a/kdeedu/parley-parentmap b/kdeedu/parley-parentmap
index 294dec9..cc6653e 100644
--- a/kdeedu/parley-parentmap
+++ b/kdeedu/parley-parentmap
@@ -1,3 +1,5 @@
+# TODO: document
+
730705 730770
742062 742235
756506 756652
@@ -10,3 +12,6 @@ clear 757794
clear 835561
830450 835561
835492 835561
+
+# merge kconfig_new_take3 into trunk
+728440 728852
diff --git a/kdeedu/parley-rules b/kdeedu/parley-rules
index 5c3e19b..5f7922a 100644
--- a/kdeedu/parley-rules
+++ b/kdeedu/parley-rules
@@ -3,6 +3,7 @@ create repository parley
end repository
declare MODULE=kdeedu/parley
+declare MODULE_RECURSE=(kdeedu/)?
declare REPO=parley
match /branches/work/(kdeedu_parley|parley-practice|soc-parley)/parley/
@@ -11,6 +12,7 @@ match /branches/work/(kdeedu_parley|parley-practice|soc-parley)/parley/
end match
include common-kdeedu-rules
+include feature-branches
# ------< trunk/KDE/kdeedu/parley >------
# [ Move/Replace: /trunk/KDE/kdeedu/parley @ 710186 <- /trunk/KDE/kdeedu/kvoctrain @ 710173 ]
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic