diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2009-04-08 11:36:24 +0000 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2009-04-08 11:36:24 +0000 |
| commit | 82792b5414a496a928b8a46538bd010627d2044e (patch) | |
| tree | baef0e65c39efb75223f68854bcddfe09fe373e8 /scripts/review | |
| parent | net-misc/kanyremote: Version bump, remove old (diff) | |
| download | sunrise-82792b5414a496a928b8a46538bd010627d2044e.tar.gz sunrise-82792b5414a496a928b8a46538bd010627d2044e.tar.bz2 sunrise-82792b5414a496a928b8a46538bd010627d2044e.zip | |
Fix it
svn path=/sunrise/; revision=8230
Diffstat (limited to 'scripts/review')
| -rwxr-xr-x | scripts/review | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/review b/scripts/review index cb9070654..3668adc63 100755 --- a/scripts/review +++ b/scripts/review @@ -192,9 +192,9 @@ fi ebegin "Merging in changes..." if [[ "$opt_verbose" == "1" ]] ; then - svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed + svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed --ignore-ancestry else - svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed -q + svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed -q --ignore-ancestry fi eend ${?} |