r2845 - trunk/scripts

Simon Horman horms@costa.debian.org
Tue, 29 Mar 2005 03:35:26 +0000


Author: horms
Date: 2005-03-29 03:35:26 +0000 (Tue, 29 Mar 2005)
New Revision: 2845

Modified:
   trunk/scripts/bk_get_patches
Log:
Uppdated URL format. Include function name in patch

Modified: trunk/scripts/bk_get_patches
===================================================================
--- trunk/scripts/bk_get_patches	2005-03-29 01:00:25 UTC (rev 2844)
+++ trunk/scripts/bk_get_patches	2005-03-29 03:35:26 UTC (rev 2845)
@@ -244,7 +244,7 @@
 	}
 
 	$patch = "";
-	open PATCH, "bk diffs -u -r$start..$end $file|";
+	open PATCH, "bk diffs -pu -r$start..$end $file|";
 	while (<PATCH>) {
 		$patch .= $_;
 	}
@@ -365,6 +365,10 @@
 		"# origin: $cset_user (BitKeeper)\n" .
 		"# cset: $cset_no ($VERSION.$PATCHLEVEL) " .
 			"key=$cset_key\n" .
+		"# URL: http://linux.bkbits.net:8080/" .
+			"linux-$VERSION.$PATCHLEVEL/" .
+			#"gnupatch\@$cset_key\n" .
+			"cset\@$cset_key\n" .
 		"# inclusion: upstream\n"  .
 		"# descrition: $cset_comment\n"  .
 		"# revision date: " .
@@ -431,7 +435,7 @@
 	# this is nasty crap
 	system_wrapper("rm -f $TMP_DIR/$basename");
 	system_wrapper("cp $file $TMP_DIR/$basename");
-	system_wrapper("bk diffs -u -r$version $file "
+	system_wrapper("bk diffs -pu -r$version $file "
 		. "| ( cd $TMP_DIR && patch -stR; )");
 	$ret = system_wrapper("diff -q $PRISTINE_DIR/$file $TMP_DIR/$basename"
 			. " > /dev/null");