tests/push-from-logs.sh - Issue 10543151: Add test for git-svn with submodule/merge layout.

Side by Side Diff

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

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

Side by Side Diff: tests/push-from-logs.sh

Issue 10543151: Add test for git-svn with submodule/merge layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/

Patch Set: Created 8 years, 6 months ago

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

Jump to:

OLD	NEW
1 #!/bin/bash	1 #!/bin/bash

2	2

	3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

	4 # Use of this source code is governed by a BSD-style license that can be

	5 # found in the LICENSE file.

	6

3 set -e	7 set -e

4	8

5 . ./test-lib.sh	9 . ./test-lib.sh

6	10

7 setup_initgit	11 setup_initgit

8 setup_gitgit	12 setup_gitgit

9	13

10 (	14 (

11 set -e	15 set -e

12 cd git-git	16 cd git-git

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 test_expect_success "upstream repo has our commit" \	62 test_expect_success "upstream repo has our commit" \

59 "git log master 2>/dev/null \| [ $( egrep -q '^branch work$' -c ) -eq 2 ]	63 "git log master 2>/dev/null \| [ $( egrep -q '^branch work$' -c ) -eq 2 ]

60 )	64 )

61 SUCCESS=$?	65 SUCCESS=$?

62	66

63 cleanup	67 cleanup

64	68

65 if [ $SUCCESS == 0 ]; then	69 if [ $SUCCESS == 0 ]; then

66 echo PASS	70 echo PASS

67 fi	71 fi

OLD	NEW

« no previous file with comments | « tests/push-basic.sh ('k') | tests/rename.sh » ('j') | no next file with comments »