diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-19 11:14:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-19 11:14:06 -0400 |
| commit | 6e89d29bd5ee93b87ab0ce97e46408d196d0f6d4 (patch) | |
| tree | 1bf82abcb81cbab3a3afdd82ac4c162e7c05aea7 /contrib | |
| parent | a8fcaed3a8428d3c0caf53cc6704c899a26f2553 (diff) | |
| download | tor-6e89d29bd5ee93b87ab0ce97e46408d196d0f6d4.tar tor-6e89d29bd5ee93b87ab0ce97e46408d196d0f6d4.tar.gz | |
Change dflt branch to inspect in findMergedChanges.pl
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/findMergedChanges.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/findMergedChanges.pl b/contrib/findMergedChanges.pl index e4ff6163e..a35b0cf50 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; |