diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2009-04-10 18:33:47 +0000 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2009-04-10 18:33:47 +0000 |
| commit | 9768223d2705f6a6de641a149d8d5f2c3612d3d4 (patch) | |
| tree | 39a88004c5e717c3943a3866270f13eb3c7d9fc8 /scripts | |
| parent | app-cdr/acetoneiso: Removed eutils inherit. (diff) | |
| download | sunrise-reviewed-9768223d2705f6a6de641a149d8d5f2c3612d3d4.tar.gz sunrise-reviewed-9768223d2705f6a6de641a149d8d5f2c3612d3d4.tar.bz2 sunrise-reviewed-9768223d2705f6a6de641a149d8d5f2c3612d3d4.zip | |
Revert unnneeded change
svn path=/sunrise/; revision=8255
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/review | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/review b/scripts/review index 3668adc63..cb9070654 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 --ignore-ancestry + svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed else - svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed -q --ignore-ancestry + svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed -q fi eend ${?} |