commit conflict fixes

funtoo/scripts/2017/merge_utils.py

@@ -414,6 +414,7 @@ def __init__(self,name,branch="master",url=None,commit=None,pull=False,root=None
 		self.name = name
 		self.root = root
 		self.branch = branch
+		print("SET BRANCH TO", self.branch)
 		self.commit = commit
 		self.url = url
 		self.merged = []
@@ -471,7 +472,6 @@ def __init__(self,name,branch="master",url=None,commit=None,pull=False,root=None
 			runShell("(cd %s; git checkout %s)" % ( self.root, self.commit ))
 
 	def gitCheckout(self,branch="master"):
-		self.branch = branch
 		runShell("(cd %s; git checkout %s)" % ( self.root, self.branch ))
 
 	def gitCommit(self,message="",upstream="origin",branch=None):

funtoo/scripts/merge-funtoo-staging.py

@@ -41,7 +41,7 @@
 	"perl" : GitTree("gentoo-perl-shard", "7ffec93dd83b76c06a69484f2d9e6d6831790d7f", "repos@localhost:ports/gentoo-perl-shard.git", pull=True),
 	"kde" : GitTree("gentoo-kde-shard", "d33259410e3eb1b0330698520796cb927ac596e7", "repos@localhost:ports/gentoo-kde-shard.git", pull=True),
 	"gnome" : GitTree("gentoo-gnome-shard", "ffabb752f8f4e23a865ffe9caf72f950695e2f26", "repos@localhost:ports/gentoo-gnome-shard.git", pull=True),
-	"xorg" : GitTree("xorg-kit", "6852e4e6471b89331481019fc8470a824e83d36d", "repos@localhost:kits/xorg-kit.git", pull=True),
+	"xorg" : GitTree("xorg-kit", "gentoo-1.19-snap", "repos@localhost:kits/xorg-kit.git", pull=True),
 	"media" : GitTree("gentoo-media-shard", "cb07fcb2f4fd84d5ca8bf57d0eacd99301cc0636", "repos@localhost:ports/gentoo-media-shard.git", pull=True),
 	"office" : GitTree("gentoo-office-shard", "e482bdff839aed9b81cd9c62ce435aa4e78c8cab", "repos@localhost:ports/gentoo-office-shard.git", pull=True),
 	"core" : GitTree("gentoo-core-shard", "4ff408b3de5465c5a63480e01e219ec62fee175e", "repos@localhost:ports/gentoo-core-shard.git", pull=True)
@@ -50,7 +50,6 @@
 # perl: 7ffec93dd83b76c06a69484f2d9e6d6831790d7f (Updated 12 Jan 2017)
 # kde: d33259410e3eb1b0330698520796cb927ac596e7 (Updated 25 Feb 2017)
 # gnome: ffabb752f8f4e23a865ffe9caf72f950695e2f26 (Updated 20 Sep 2016)
-# xorg: 6852e4e6471b89331481019fc8470a824e83d36d (Updated 25 Feb 2017)
 # media: cb07fcb2f4fd84d5ca8bf57d0eacd99301cc0636 (Update 25 Feb 2017)
 # office: e482bdff839aed9b81cd9c62ce435aa4e78c8cab (Updated 17 Jan 2017)
 # core: 4ff408b3de5465c5a63480e01e219ec62fee175e (Updated 25 Feb 2017)

funtoo/scripts/merge-xorg.py

@@ -5,7 +5,7 @@
 # gentoo-1.19-snap: 355a7986f9f7c86d1617de98d6bf11906729f108
 # gentoo-1.17-snap: Nov 18th, 2016: a56abf6b7026dae27f9ca30ed4c564a16ca82685
 branch = "gentoo-1.17-snap"
-gentoo_staging_w = GitTree("gentoo-staging", "d422f9aee8cba87a4d8ba8cfc6f49175be38a353", "repos@localhost:ports/gentoo-staging.git", root="/var/git/dest-trees/gentoo-staging", pull=False)
+gentoo_staging_w = GitTree("gentoo-staging", "a56abf6b7026dae27f9ca30ed4c564a16ca82685", "repos@localhost:ports/gentoo-staging.git", root="/var/git/dest-trees/gentoo-staging", pull=False)
 
 # shards are overlays where we collect gentoo's most recent changes. This way, we can merge specific versions rather than always be forced to
 # get the latest.
@@ -15,8 +15,8 @@
 shard_steps = {}
 
 for s in shard_names:
-	shards[s] = GitTree( s, branch, "repos@localhost:kits/%s" % s, root="/var/git/dest-trees/%s" % s, pull=False)
-	shard_steps[s] = generateShardSteps(s, gentoo_staging_w)
+	shards[s] = GitTree( s, branch=branch, url="repos@localhost:kits/%s" % s, root="/var/git/dest-trees/%s" % s, pull=False)
+	shard_steps[s] = generateShardSteps(s, gentoo_staging_w, branch=branch)
 
 # This function updates the gentoo-staging tree with all the latest gentoo updates: