tests/submodule-merge-test.sh - Issue 723283003: Fix submodule-merge-test.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tests/submodule-merge-test.sh

Issue 723283003: Fix submodule-merge-test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tests/submodule-merge-test.sh

diff --git a/tests/submodule-merge-test.sh b/tests/submodule-merge-test.sh

index 8818a2a5c11e997ccf816ca95e7d03353eeb533a..d626db2c075b0070d2cb9620421a873a8bb4184d 100755

--- a/tests/submodule-merge-test.sh

+++ b/tests/submodule-merge-test.sh

@@ -43,7 +43,7 @@ TBR=foo"

cd git-svn-submodule

git svn fetch

- last_svn_rev=`git show refs/remotes/trunk | grep git-svn-id: | \

+ last_svn_rev=`git show refs/remotes/origin/trunk | grep git-svn-id: | \

grep -o trunk@[0-9]* | xargs`

test_expect_success "git svn fetch gets new svn revision" \

« no previous file with comments | « no previous file | tests/test-lib.sh » ('j') | no next file with comments »