Created
September 13, 2011 19:44
-
-
Save jfirebaugh/1214879 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git svn clone -Tlinecache/trunk -tlinecache/tags -blinecache/branches svn://rubyforge.org/var/svn/rocky-hacks linecache | |
Initialized empty Git repository in /Users/jfire/Development/linecache/.git/ | |
A test/test-linecache.rb | |
A Rakefile | |
A AUTHORS | |
A VERSION | |
A lib/linecache.rb | |
A ChangeLog | |
A COPYING | |
A NEWS | |
A README | |
r3 = efe8a64b9b8ffb4e0fcb20de719f1c8aa56c8db3 (refs/remotes/trunk) | |
M test/test-linecache.rb | |
M Rakefile | |
M lib/linecache.rb | |
M ChangeLog | |
M NEWS | |
M README | |
r4 = a152b191aec69c2dd306c5767fee60d55650f192 (refs/remotes/trunk) | |
M Rakefile | |
r5 = c25b101a21b38d19192de5c450287f93b03bb089 (refs/remotes/trunk) | |
M test/test-linecache.rb | |
r6 = c9937ceb3244d76ccd6893bdd7b38134a183377d (refs/remotes/trunk) | |
M Rakefile | |
r7 = 622da960ee8dfbaa66c78bf8ed0b4054bc7f9128 (refs/remotes/trunk) | |
M test/test-linecache.rb | |
M Rakefile | |
M lib/linecache.rb | |
M ChangeLog | |
r13 = cdca077bcccd62d65acbdb2c108258ac6830516f (refs/remotes/trunk) | |
M lib/linecache.rb | |
r15 = 38f73df6ce84e408f22a484ae7297f5bfc824e45 (refs/remotes/trunk) | |
Found possible branch point: svn://rubyforge.org/var/svn/rocky-hacks/linecache/linecache/trunk => svn://rubyforge.org/var/svn/rocky-hacks/linecache/trunk, 162 | |
Initializing parent: refs/remotes/trunk@162 | |
branch_from: /linecache => /linecache/trunk | |
Found possible branch point: svn://rubyforge.org/var/svn/rocky-hacks/linecache/trunk => svn://rubyforge.org/var/svn/rocky-hacks/linecache/linecache/trunk, 15 | |
Found branch parent: (refs/remotes/trunk@162) 38f73df6ce84e408f22a484ae7297f5bfc824e45 | |
Following parent with do_switch | |
Successfully followed parent | |
r16 = 09e13a2ef14216630f6da201b7d9a3f98c89934c (refs/remotes/trunk@162) | |
M lib/linecache.rb | |
r18 = dbf6da0ac211effa8ca86b15badb9dae5455bea5 (refs/remotes/trunk@162) | |
M VERSION | |
M lib/linecache.rb | |
M ChangeLog | |
r19 = 3e5bb3a30b809f862704c544fe53e2be1af15ae7 (refs/remotes/trunk@162) | |
M lib/linecache.rb | |
r20 = 5e17476dac99df34cb7c319013d023316f0e3f68 (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
M lib/linecache.rb | |
r21 = a9c1957dabe95c38e9e3c1ec6c43504b57935c4e (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
A test/short-file | |
M Rakefile | |
M lib/linecache.rb | |
r22 = 960f846455dccddc4c25fe7a8c6cc71353ca9592 (refs/remotes/trunk@162) | |
M lib/linecache.rb | |
r23 = c20b9c9e608dff5fcf2a47bb493a70cebe7dbfb6 (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
r24 = 20d1bc0737e694af6d1720c2e009229c418e0f3a (refs/remotes/trunk@162) | |
M NEWS | |
r25 = b3eb4146c0adca2f0ad27e5767a8a83834f1165f (refs/remotes/trunk@162) | |
M lib/linecache.rb | |
r26 = b1a513b441e1e42a40da5150298721e349481bc1 (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
M VERSION | |
M lib/linecache.rb | |
r27 = 1d8f39e48f6da795683003edaedae06a521cd288 (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
M lib/linecache.rb | |
r28 = 38e59f61284886ee271e9ad3e7125dc4f14e07c3 (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
M test/short-file | |
M lib/linecache.rb | |
r29 = 890752dcd86de33ab72fc65bbd33d860a5557526 (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
M lib/linecache.rb | |
r30 = a569de88f61ee313425a065347ef8f0c3c1a2753 (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
M lib/linecache.rb | |
r31 = 5df9596db7fa9594d2931c1d4342690f7a7bd1cb (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
M lib/linecache.rb | |
r32 = f65b98b255ba9b1f13c04fe2f16165a08276b58f (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
M lib/linecache.rb | |
r33 = b9bfc6218661acd632e945d9ae21625e09181b2b (refs/remotes/trunk@162) | |
A test/rcov-bug.rb | |
A test/test-tracelines.rb | |
M Rakefile | |
A lib/tracelines.rb | |
M lib/linecache.rb | |
M ChangeLog | |
r34 = 6e52da2d48e1c538d5cf2285f676ba145119ba65 (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
M Rakefile | |
M lib/linecache.rb | |
r35 = 5eaa33aba8c7325677833372f3221242067936d0 (refs/remotes/trunk@162) | |
A test/lnum-data/begin1.rb | |
A test/lnum-data/begin2.rb | |
A test/lnum-data/begin3.rb | |
M test/test-tracelines.rb | |
A ext/trace_nums.c | |
A ext/trace_nums.h | |
A ext/extconf.rb | |
M Rakefile | |
M lib/tracelines.rb | |
M lib/linecache.rb | |
r36 = 7664a2f24f69cbc07d6d8f221c2937c3ab82240e (refs/remotes/trunk@162) | |
A test/test-lnum.rb | |
r37 = 193f9a3d1ea163e09722f00ccc4f4a48f42e6135 (refs/remotes/trunk@162) | |
M ext/trace_nums.c | |
M ChangeLog | |
r38 = ee4a8c63190630cb864bfb0f54d571e94239a8ea (refs/remotes/trunk@162) | |
A test/lnum-diag.rb | |
A test/parse-show.rb | |
M ext/trace_nums.c | |
r39 = a6a090cf84b7be808c08f5d5be8f6f0aa51348d6 (refs/remotes/trunk@162) | |
M test/lnum-diag.rb | |
r40 = a5c615990ce25aa1f74fa7b15a29250e564769e4 (refs/remotes/trunk@162) | |
M test/lnum-diag.rb | |
r41 = 6fdbcfef574abfeca50671510affbbf894eb934e (refs/remotes/trunk@162) | |
M test/lnum-diag.rb | |
r42 = 2924d33017f0fd84c2b2d35468a4b3ca7e4ddb01 (refs/remotes/trunk@162) | |
M NEWS | |
r43 = 17887662e102092947e349f3a5cc1058e51a4153 (refs/remotes/trunk@162) | |
M test/lnum-diag.rb | |
A test/lnum-data/end.rb | |
A test/lnum-data/not-lit.rb | |
M test/lnum-data/begin3.rb | |
A test/lnum-data/match.rb | |
M ext/trace_nums.c | |
r44 = 1b044522f843fa7fdaa1b930fbfa89415acca218 (refs/remotes/trunk@162) | |
M test/lnum-diag.rb | |
r45 = fd3476f558fbad5fbb92d87cffc6ccd78a0b4abf (refs/remotes/trunk@162) | |
M test/lnum-diag.rb | |
M test/rcov-bug.rb | |
M test/test-tracelines.rb | |
M test/test-linecache.rb | |
r46 = c3059037bf443917793590231ef73f9a40d4fd8c (refs/remotes/trunk@162) | |
D test/lnum-data/begin1.rb | |
D test/lnum-data/begin2.rb | |
D test/lnum-data/begin3.rb | |
D test/lnum-data/end.rb | |
D test/lnum-data/match.rb | |
D test/lnum-data/not-lit.rb | |
D test/lnum-data/ | |
M test/lnum-diag.rb | |
M test/test-tracelines.rb | |
A test/data/begin1.rb | |
A test/data/begin2.rb | |
A test/data/end.rb | |
A test/data/not-lit.rb | |
A test/data/begin3.rb | |
A test/data/match.rb | |
M test/test-lnum.rb | |
M ext/trace_nums.c | |
W: -empty_dir: linecache/linecache/trunk/test/lnum-data | |
r47 = 55bf29c29a235ff9c66e7a9c6469172727b51c6f (refs/remotes/trunk@162) | |
A test/data/case2.rb | |
A test/data/case3.rb | |
A test/data/match3.rb | |
A test/data/match3a.rb | |
A test/data/case1.rb | |
M ext/trace_nums.c | |
r48 = d71acacf2fbb15f65e1b149402e58f92d34d9449 (refs/remotes/trunk@162) | |
M ext/trace_nums.c | |
r49 = 7e74d0fb5841d4f91a9c6aff154316352dad8775 (refs/remotes/trunk@162) | |
A test/data/if1.rb | |
A test/data/if2.rb | |
A test/data/each1.rb | |
A test/data/for1.rb | |
M test/test-lnum.rb | |
r50 = 09555c296b1137f6398b9570771e9468d6999866 (refs/remotes/trunk@162) | |
M test/rcov-bug.rb | |
M test/test-tracelines.rb | |
M test/test-linecache.rb | |
M ext/trace_nums.c | |
r51 = a6ad8adb5d8d2a7aee6a8b24798b30e64af5c835 (refs/remotes/trunk@162) | |
A test/data/class1.rb | |
M ext/trace_nums.c | |
r52 = 514a0eb114f050123ebd734c86e474c3e2cdac45 (refs/remotes/trunk@162) | |
A test/data/comments1.rb | |
r53 = c8ead5e0385e9f6a1604c860cb3855a3426af70e (refs/remotes/trunk@162) | |
M test/lnum-diag.rb | |
A test/data/def1.rb | |
A test/data/if3.rb | |
A test/data/case4.rb | |
M ext/trace_nums.c | |
M ext/trace_nums.h | |
r54 = 1d04c283f37a90ecf565864b74b050fee73819fc (refs/remotes/trunk@162) | |
M test/lnum-diag.rb | |
A test/data/if4.rb | |
A test/data/block1.rb | |
A test/data/block2.rb | |
M ext/trace_nums.c | |
r55 = 504749b93928fb6b7332562dcf51ae599d728fee (refs/remotes/trunk@162) | |
M test/data/match3.rb | |
M test/data/def1.rb | |
M test/data/match3a.rb | |
M test/data/if3.rb | |
M test/data/each1.rb | |
M test/data/if4.rb | |
M test/data/not-lit.rb | |
M test/data/case1.rb | |
M test/data/case2.rb | |
M test/data/case3.rb | |
M test/data/case4.rb | |
A test/data/case5.rb | |
M test/data/for1.rb | |
M test/data/block1.rb | |
M test/data/block2.rb | |
M ext/trace_nums.c | |
r56 = d9d1366d0556d35f2d69341ca273fee33dfcf057 (refs/remotes/trunk@162) | |
M test/data/case5.rb | |
r57 = aeef408429d97b052b609dd66e29c20b0d7a68ad (refs/remotes/trunk@162) | |
A test/data/if5.rb | |
M ext/trace_nums.c | |
M ext/trace_nums.h | |
r58 = 2adfecfdaf75817a23c0b3ae688e418810b93e40 (refs/remotes/trunk@162) | |
M lib/linecache.rb | |
M ChangeLog | |
r59 = d86b8cd492afff3be637f92304ec0d526d7ed2a4 (refs/remotes/trunk@162) | |
M test/test-linecache.rb | |
r60 = e2fc214c415b1a71954d33b041368dbaa4fbf8f8 (refs/remotes/trunk@162) | |
M ext/trace_nums.c | |
M Rakefile | |
A svn2cl_usermap | |
M ChangeLog | |
W: +empty_dir: linecache/linecache/trunk/ext/win32 | |
r61 = bcd74b43a52e0065bd09deffd9dfade279caf4e4 (refs/remotes/trunk@162) | |
M README | |
r63 = d26e032ea8a104a30524e40c506eaeaa341ef36f (refs/remotes/trunk@162) | |
M Rakefile | |
r64 = e02fd445f344496422b6394893cd2c26215d012a (refs/remotes/trunk@162) | |
M Rakefile | |
M VERSION | |
M lib/linecache.rb | |
M ChangeLog | |
r69 = dcf8f5fc82e1b15ffd1d35b31874c09460e62119 (refs/remotes/trunk@162) | |
A test/data/if6.rb | |
A test/data/if7.rb | |
r97 = d36a30137cab7b0bd7a4c380284a9cf3cdb6286e (refs/remotes/trunk@162) | |
M NEWS | |
r117 = ffeaa25701bb02cc9a9a72d4ab82c9e65af28f2c (refs/remotes/trunk@162) | |
M Rakefile | |
M VERSION | |
M ChangeLog | |
r118 = dfe90be87d48b0be0b36bee585114ed6bd458238 (refs/remotes/trunk@162) | |
M NEWS | |
r119 = 002545e41292f4a64363e23929a64069d95dfe56 (refs/remotes/trunk@162) | |
M Rakefile | |
M VERSION | |
M ChangeLog | |
r120 = a9d5795867a99cad8cf69e83bd635801eca5aec2 (refs/remotes/trunk@162) | |
M VERSION | |
M lib/tracelines.rb | |
M ChangeLog | |
r143 = 888023947480677dfe4ea1c2399fb4cbb3f76005 (refs/remotes/trunk@162) | |
M ChangeLog | |
M NEWS | |
r144 = 05ce9086a64384650043289870a30f214945e2a6 (refs/remotes/trunk@162) | |
Found branch parent: (refs/remotes/trunk) 05ce9086a64384650043289870a30f214945e2a6 | |
Index mismatch: d67f9e0a58513d338a83147e52d7d7006979ab15 != d371b8b6191b68af14d1c7eaa8a7c6609a11cdd4 | |
rereading 05ce9086a64384650043289870a30f214945e2a6 | |
Following parent with do_switch | |
Use of uninitialized value in concatenation (.) or string at /System/Library/Perl/Extras/5.10.0/darwin-thread-multi-2level/SVN/Core.pm line 584. | |
Network connection closed unexpectedly: at /usr/local/Cellar/git/1.7.6.1/libexec/git-core/git-svn line 2778 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I was able to resolve this simply by rerunning the
git svn
command. It seemed to pick up where it had left off, and the resulting history was what I expected.