[tor-commits] [tor/master] Change dflt branch to inspect in findMergedChanges.pl
nickm at torproject.org
nickm at torproject.org
Fri Apr 19 15:14:08 UTC 2013
commit 6e89d29bd5ee93b87ab0ce97e46408d196d0f6d4
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Apr 19 11:14:06 2013 -0400
Change dflt branch to inspect in findMergedChanges.pl
---
contrib/findMergedChanges.pl | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/findMergedChanges.pl b/contrib/findMergedChanges.pl
index e4ff616..a35b0cf 100755
--- a/contrib/findMergedChanges.pl
+++ b/contrib/findMergedChanges.pl
@@ -21,13 +21,13 @@ if (! @ARGV) {
Usage:
findMergedChanges.pl [--merged/--unmerged/--weird/--list] [--branch=<branchname] changes/*
-A change is "merged" if it has ever been merged to release-0.2.2 and it has had
+A change is "merged" if it has ever been merged to release-0.2.4 and it has had
no subsequent changes in master.
-A change is "unmerged" if it has never been merged to release-0.2.2 and it
+A change is "unmerged" if it has never been merged to release-0.2.4 and it
has had changes in master.
-A change is "weird" if it has been merged to release-0.2.2 and it *has* had
+A change is "weird" if it has been merged to release-0.2.4 and it *has* had
subsequent changes in master.
Suggested application:
@@ -36,7 +36,7 @@ Suggested application:
EOF
}
-my $target_branch = "origin/release-0.2.2";
+my $target_branch = "origin/release-0.2.4";
while (@ARGV and $ARGV[0] =~ /^--/) {
my $flag = shift @ARGV;
More information about the tor-commits
mailing list