tests/test-lib.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/test-lib.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/test-lib.sh

diff --git a/tests/test-lib.sh b/tests/test-lib.sh

index 1e7223d36a9419c7dd8d74ce08c6535c9e7be74d..c384327b5db3be5a76a3d2a793bfc8e3bd26e044 100755

--- a/tests/test-lib.sh

+++ b/tests/test-lib.sh

@@ -72,7 +72,7 @@ setup_gitsvn_submodule() {

git config user.email 'TestDood@example.com'

echo 'merge-file line 1' > merge-file

git add merge-file; git commit -q -m 'First non-svn commit on master'

- git checkout -q refs/remotes/trunk

+ git checkout -q refs/remotes/origin/trunk

git merge -q --no-commit --no-ff refs/heads/master >/dev/null 2>&1

echo 'merge-edit-file line 1' > merge-edit-file

git add merge-edit-file

« no previous file with comments | « tests/submodule-merge-test.sh ('k') | no next file » | no next file with comments »