comparison tests/test_tags.py @ 917:6918f60d0e28

Merge hg 2.3 fixes from bos.
author Augie Fackler <raf@durin42.com>
date Sat, 21 Jul 2012 15:31:34 -0500
parents 7e9d805a0e1f
children 5bacb9c63e3e
comparison
equal deleted inserted replaced
913:9fff2b8217b6 917:6918f60d0e28
110 self.repo.ui.status( 110 self.repo.ui.status(
111 "Note: this test failing may be because of a rebuildmeta failure.\n" 111 "Note: this test failing may be because of a rebuildmeta failure.\n"
112 "You should check that before assuming issues with this test.\n") 112 "You should check that before assuming issues with this test.\n")
113 wc2_path = self.wc_path + '2' 113 wc2_path = self.wc_path + '2'
114 src, dest = test_util.hgclone(repo.ui, self.wc_path, wc2_path, update=False) 114 src, dest = test_util.hgclone(repo.ui, self.wc_path, wc2_path, update=False)
115 dest = getattr(dest, 'local', lambda: dest)()
115 svncommands.rebuildmeta(repo.ui, 116 svncommands.rebuildmeta(repo.ui,
116 dest, 117 dest,
117 args=[test_util.fileurl(repo_path), ]) 118 args=[test_util.fileurl(repo_path), ])
118 commands.pull(self.repo.ui, self.repo, stupid=stupid) 119 commands.pull(self.repo.ui, self.repo, stupid=stupid)
119 dtags, srctags = dest.tags(), self.repo.tags() 120 dtags, srctags = dest.tags(), self.repo.tags()