equal
deleted
inserted
replaced
147 except cfg.ConfigError, e: |
147 except cfg.ConfigError, e: |
148 raise repo.RepositoryError(_("The specified " |
148 raise repo.RepositoryError(_("The specified " |
149 "repository's configuration data is not " |
149 "repository's configuration data is not " |
150 "valid:\n%s") % e) |
150 "valid:\n%s") % e) |
151 |
151 |
152 def merge(self, args=misc.EmptyI, exit=0): |
|
153 prog = os.path.realpath(os.path.join(path_to_pub_util, |
|
154 "merge.py")) |
|
155 cmd = "%s %s" % (prog, " ".join(args)) |
|
156 self.cmdline_run(cmd, exit=exit) |
|
157 |
|
158 def test_0_merge(self): |
152 def test_0_merge(self): |
159 """Verify that merge functionality works as expected.""" |
153 """Verify that merge functionality works as expected.""" |
160 |
154 |
161 pkg_names = set() |
155 pkg_names = set() |
162 flist = [] |
156 flist = [] |