From c27e0b0cc5989eba84ca223e3c0ce4bc25b7a86e Mon Sep 17 00:00:00 2001
From: Henrik Nord <henrik@erlang.org>
Date: Mon, 10 Oct 2011 11:54:47 +0200
Subject: Update scripts to reflect branch changes

---
 cook | 10 +++++-----
 page |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cook b/cook
index f04f9ee1b2..c57f3ffa97 100755
--- a/cook
+++ b/cook
@@ -36,12 +36,12 @@ print "From: $from\n"
 print "Date: $header_date\n";
 print "To: erlang patches <erlang-patches\@erlang.org>\n";
 print "Subject: $title\n";
-print "X-dev-at: ", `git rev-parse dev`;
+print "X-dev-at: ", `git rev-parse master`;
 
 my %cooking;
 my %stalled;
 my $current;
-my $prev_dev = 'master';
+my $prev_dev = '`git describe master`';
 if (@ARGV) {
     my $state = 'header';
     while (<>) {
@@ -95,7 +95,7 @@ map { s/^\s*// } @old_in_dev;
 @old_in_dev = grep { m@^[^/]{2,4}/[^/]*@ } @old_in_dev;
 my %old_in_dev = map { $_ => 1 } @old_in_dev;
 
-my @in_dev = `git branch --merged dev`;
+my @in_dev = `git branch --merged master`;
 chomp @in_dev;
 map { s/^\s*// } @in_dev;
 @in_dev = grep { m@^[^/]{2,4}/[^/]*@  && !exists $old_in_dev{$_} } @in_dev;
@@ -117,7 +117,7 @@ map { s@^refs/heads/@@ } @dropped;
 		      !exists $in_pu{$_} } @dropped;
 
 my %child;
-foreach (`git rev-list --no-merges --children master..dev`) {
+foreach (`git rev-list --no-merges --children $prev_dev..pu`) {
     chomp;
     my($ref,$child) = split ' ';
     $child{$ref} = $child;
@@ -165,7 +165,7 @@ sub header {
 
 sub describe {
     my($marker,$topic,$text) = @_;
-    print_commits($topic, "dev..$topic", $marker);
+    print_commits($topic, "master..$topic", $marker);
     $text =~ s/\n*$//g;
     print "\n$text\n" if $text ne '';
     print "\n";
diff --git a/page b/page
index 37ef428b60..3ff54155b2 100755
--- a/page
+++ b/page
@@ -56,7 +56,7 @@ the topic branch has been updated.
 END
 
 my $root_url = "https://github.com/erlang/otp/commit";
-foreach (`git log --oneline --first-parent dev..pu`) {
+foreach (`git log --oneline --first-parent master..pu`) {
     if (/^([\da-f]*) Merge branch '([^\']*)'/) {
 	my($child,$topic) = ($1,$2);
 	my $range = "$child^1..$child^2";
-- 
cgit v1.2.3