From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH 28/40] whitespace: remediate t9104-git-svn-follow-parent.sh
Date: Sat, 6 Aug 2011 18:44:42 +1000 [thread overview]
Message-ID: <1312620294-18616-28-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9104-git-svn-follow-parent.sh | 88 +++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 13b179e..1ba69f4 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -32,57 +32,57 @@ test_expect_success 'init and fetch a moved directory' '
git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
git svn fetch -i thunk &&
test "`git rev-parse --verify refs/remotes/thunk@2`" \
- = "`git rev-parse --verify refs/remotes/thunk~1`" &&
- test "`git cat-file blob refs/remotes/thunk:readme |\
- sed -n -e "3p"`" = goodbye &&
+ = "`git rev-parse --verify refs/remotes/thunk~1`" &&
+ test "`git cat-file blob refs/remotes/thunk:readme |\
+ sed -n -e "3p"`" = goodbye &&
test -z "`git config --get svn-remote.svn.fetch \
- "^trunk:refs/remotes/thunk@2$"`"
+ "^trunk:refs/remotes/thunk@2$"`"
'
test_expect_success 'init and fetch from one svn-remote' '
- git config svn-remote.svn.url "$svnrepo" &&
- git config --add svn-remote.svn.fetch \
- trunk:refs/remotes/svn/trunk &&
- git config --add svn-remote.svn.fetch \
- thunk:refs/remotes/svn/thunk &&
- git svn fetch -i svn/thunk &&
+ git config svn-remote.svn.url "$svnrepo" &&
+ git config --add svn-remote.svn.fetch \
+ trunk:refs/remotes/svn/trunk &&
+ git config --add svn-remote.svn.fetch \
+ thunk:refs/remotes/svn/thunk &&
+ git svn fetch -i svn/thunk &&
test "`git rev-parse --verify refs/remotes/svn/trunk`" \
- = "`git rev-parse --verify refs/remotes/svn/thunk~1`" &&
- test "`git cat-file blob refs/remotes/svn/thunk:readme |\
- sed -n -e "3p"`" = goodbye
- '
+ = "`git rev-parse --verify refs/remotes/svn/thunk~1`" &&
+ test "`git cat-file blob refs/remotes/svn/thunk:readme |\
+ sed -n -e "3p"`" = goodbye
+ '
test_expect_success 'follow deleted parent' '
- (svn_cmd cp -m "resurrecting trunk as junk" \
- "$svnrepo"/trunk@2 "$svnrepo"/junk ||
- svn cp -m "resurrecting trunk as junk" \
- -r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
- git config --add svn-remote.svn.fetch \
- junk:refs/remotes/svn/junk &&
- git svn fetch -i svn/thunk &&
- git svn fetch -i svn/junk &&
- test -z "`git diff svn/junk svn/trunk`" &&
- test "`git merge-base svn/junk svn/trunk`" \
- = "`git rev-parse svn/trunk`"
- '
+ (svn_cmd cp -m "resurrecting trunk as junk" \
+ "$svnrepo"/trunk@2 "$svnrepo"/junk ||
+ svn cp -m "resurrecting trunk as junk" \
+ -r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
+ git config --add svn-remote.svn.fetch \
+ junk:refs/remotes/svn/junk &&
+ git svn fetch -i svn/thunk &&
+ git svn fetch -i svn/junk &&
+ test -z "`git diff svn/junk svn/trunk`" &&
+ test "`git merge-base svn/junk svn/trunk`" \
+ = "`git rev-parse svn/trunk`"
+ '
test_expect_success 'follow larger parent' '
- mkdir -p import/trunk/thunk/bump/thud &&
- echo hi > import/trunk/thunk/bump/thud/file &&
- svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
- svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
- git svn init --minimize-url -i larger \
- "$svnrepo"/another-larger/trunk/thunk/bump/thud &&
- git svn fetch -i larger &&
- git rev-parse --verify refs/remotes/larger &&
- git rev-parse --verify \
- refs/remotes/larger-parent/trunk/thunk/bump/thud &&
- test "`git merge-base \
- refs/remotes/larger-parent/trunk/thunk/bump/thud \
- refs/remotes/larger`" = \
- "`git rev-parse refs/remotes/larger`"
- true
- '
+ mkdir -p import/trunk/thunk/bump/thud &&
+ echo hi > import/trunk/thunk/bump/thud/file &&
+ svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
+ svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
+ git svn init --minimize-url -i larger \
+ "$svnrepo"/another-larger/trunk/thunk/bump/thud &&
+ git svn fetch -i larger &&
+ git rev-parse --verify refs/remotes/larger &&
+ git rev-parse --verify \
+ refs/remotes/larger-parent/trunk/thunk/bump/thud &&
+ test "`git merge-base \
+ refs/remotes/larger-parent/trunk/thunk/bump/thud \
+ refs/remotes/larger`" = \
+ "`git rev-parse refs/remotes/larger`"
+ true
+ '
test_expect_success 'follow higher-level parent' '
svn mkdir -m "follow higher-level parent" "$svnrepo"/blob &&
@@ -96,8 +96,8 @@ test_expect_success 'follow higher-level parent' '
svn mkdir -m "new glob at top level" "$svnrepo"/glob &&
svn mv -m "move blob down a level" "$svnrepo"/blob "$svnrepo"/glob/blob &&
git svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
- git svn fetch -i blob
- '
+ git svn fetch -i blob
+ '
test_expect_success 'follow deleted directory' '
svn_cmd mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
--
1.7.6.362.gf0e6
next prev parent reply other threads:[~2011-08-06 8:46 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-06 8:41 [PATCH 00/40] test whitespace - perform trivial whitespace clean ups of test scripts Jon Seymour
2011-08-06 8:44 ` [PATCH 01/40] test-cleaner: automate whitespace cleaning " Jon Seymour
2011-08-06 8:44 ` [PATCH 02/40] whitespace: remediate t1001-read-tree-m-2way.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 03/40] whitespace: remediate t1006-cat-file.sh Jon Seymour
2011-08-06 9:28 ` Jeff King
2011-08-06 9:47 ` Jon Seymour
2011-08-06 17:56 ` Junio C Hamano
2011-08-06 22:56 ` Jon Seymour
2011-08-06 8:44 ` [PATCH 04/40] whitespace: remediate t1300-repo-config.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 05/40] whitespace: remediate t1503-rev-parse-verify.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 06/40] whitespace: remediate t3040-subprojects-basic.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 07/40] whitespace: remediate t3200-branch.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 08/40] whitespace: remediate t3406-rebase-message.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 09/40] whitespace: remediate t4002-diff-basic.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 10/40] whitespace: remediate t4010-diff-pathspec.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 11/40] whitespace: remediate t5300-pack-object.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 12/40] whitespace: remediate t5301-sliding-window.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 13/40] whitespace: remediate t5302-pack-index.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 14/40] whitespace: remediate t5303-pack-corruption-resilience.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 15/40] whitespace: remediate t5400-send-pack.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 16/40] whitespace: remediate t5402-post-merge-hook.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 17/40] whitespace: remediate t5403-post-checkout-hook.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 18/40] whitespace: remediate t5510-fetch.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 19/40] whitespace: remediate t6002-rev-list-bisect.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 20/40] whitespace: remediate t6005-rev-list-count.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 21/40] whitespace: remediate t6030-bisect-porcelain.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 22/40] whitespace: remediate t7003-filter-branch.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 23/40] whitespace: remediate t7004-tag.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 24/40] whitespace: remediate t7403-submodule-sync.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 25/40] whitespace: remediate t7500-commit.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 26/40] whitespace: remediate t7810-grep.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 27/40] whitespace: remediate t9100-git-svn-basic.sh Jon Seymour
2011-08-06 8:44 ` Jon Seymour [this message]
2011-08-06 8:44 ` [PATCH 29/40] whitespace: remediate t9107-git-svn-migrate.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 30/40] whitespace: remediate t9108-git-svn-glob.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 31/40] whitespace: remediate t9109-git-svn-multi-glob.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 32/40] whitespace: remediate t9110-git-svn-use-svm-props.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 33/40] whitespace: remediate t9118-git-svn-funky-branch-names.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 34/40] whitespace: remediate t9125-git-svn-multi-glob-branch-names.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 35/40] whitespace: remediate t9400-git-cvsserver-server.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 36/40] whitespace: remediate t9401-git-cvsserver-crlf.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 37/40] whitespace: remediate t9500-gitweb-standalone-no-errors.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 38/40] whitespace: remediate t9603-cvsimport-patchsets.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 39/40] whitespace: remediate t1000-read-tree-m-3way.sh Jon Seymour
2011-08-06 8:44 ` [PATCH 40/40] whitespace: remediate t6120-describe.sh Jon Seymour
2011-08-06 9:17 ` [PATCH 01/40] test-cleaner: automate whitespace cleaning of test scripts Jon Seymour
2011-08-06 15:48 ` [PATCH] whitespace: additional whitespace clean ups Jon Seymour
2011-08-06 9:03 ` [PATCH 00/40] test whitespace - perform trivial whitespace clean ups of test scripts Jon Seymour
2011-08-06 9:20 ` Jeff King
2011-08-06 9:36 ` Jon Seymour
2011-08-06 9:26 ` [PATCH replacement for 01/40] test-cleaner: automate whitespace cleaning " Jon Seymour
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1312620294-18616-28-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).