summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgsinclair <gsinclair@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-30 10:13:54 +0000
committergsinclair <gsinclair@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-30 10:13:54 +0000
commit7208582d9862d7641ed3eb947baa7cf2c6064b93 (patch)
tree7819d96c511d8d216cc26a2d87f7531816748391
parenta2e5adee13910231e9f3ccda7afad7d4ea775739 (diff)
downloadruby-7208582d9862d7641ed3eb947baa7cf2c6064b93.tar.gz
ruby-7208582d9862d7641ed3eb947baa7cf2c6064b93.tar.xz
ruby-7208582d9862d7641ed3eb947baa7cf2c6064b93.zip
Re-applied revision 1.21 as its changes were lost on the way to 1.22
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5351 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/pathname.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pathname.rb b/lib/pathname.rb
index e50b2f487..d3c06bd70 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -946,9 +946,11 @@ if $0 == __FILE__
assert_pathname_plus('/', '/', '..')
assert_pathname_plus('.', 'a', '..')
assert_pathname_plus('a', 'a/b', '..')
+ assert_pathname_plus('../..', '..', '..')
assert_pathname_plus('/c', '/', '../c')
assert_pathname_plus('c', 'a', '../c')
assert_pathname_plus('a/c', 'a/b', '../c')
+ assert_pathname_plus('../../c', '..', '../c')
end
end
end