[Frugalware-darcs] pacman-tools: dg: disable cherry-pick for merges

VMiklos vmiklos at frugalware.org
Mon Jul 2 09:22:08 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20070702072103-e2957-5835d8cef825a4d68ad8ec5a681c956462143ffe.gz;

[dg: disable cherry-pick for merges
VMiklos <vmiklos at frugalware.org>**20070702072103] {
hunk ./darcs-git.py 92
+def merge_check():
+	ret = False
+	sock = os.popen("git diff")
+	lines = sock.readlines()
+	sock.close()
+	for i in lines:
+		if i.startswith("diff --cc "):
+			ret = True
+			break
+	return ret
+
hunk ./darcs-git.py 264
-	if first:
+	merge = False
+	if merge_check():
+		print "This is a merge, can't cherry-pick for this commit."
+		merge = True
+	if first or merge:
hunk ./darcs-git.py 276
-	if first or status.hunks:
+	if first or merge or status.hunks:
hunk ./darcs-git.py 297
-	if first or options.all:
+	if first or merge or options.all:
}


More information about the Frugalware-darcs mailing list