From b0318ab9940bc769f7b7ad56dff3c1d7d1e634dd Mon Sep 17 00:00:00 2001 From: Alex Tarkovsky Date: Tue, 4 Jul 2006 22:07:55 +0000 Subject: [PATCH] scripts/sunrise-commit: Fixed svn add to include cwd. genstef++ svn path=/sunrise/; revision=470 --- scripts/sunrise-commit | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/sunrise-commit b/scripts/sunrise-commit index 69afaafb1..85260222d 100755 --- a/scripts/sunrise-commit +++ b/scripts/sunrise-commit @@ -64,9 +64,9 @@ repoman_check() { svn_add() { ebegin "Adding local changes to working copy" if [[ "$opt_verbose" == "1" ]] ; then - svn add * --force + svn add ../$(basename `pwd`) --force else - svn add * --force -q + svn add ../$(basename `pwd`) --force -q fi eend $? } @@ -142,8 +142,8 @@ svn_up() { local conflict_files=$(svn status | sed -rn 's/^C.+ ([^ ]+)$/\1/p') if [[ -n "$conflict_files" ]] ; then echo "!!! Error: Some local files have changes that conflict with the latest" - echo "!!! revisions in the repository. Please contact their committer(s) to resolve" - echo "!!! the conflicts manually before running sunrise-commit again:" + echo "!!! revisions in the repository. Please contact the previous committer(s) to" + echo "!!! resolve the conflicts manually before running sunrise-commit again:" for filename in $conflict_files ; do echo "!!!" echo "!!! file: ${filename}" -- 2.43.2