1863
|
|
|
Jeff Lane |
11 years ago
|
|
|
1862
|
|
|
Zygmunt Krynicki |
11 years ago
|
|
|
1861
|
|
|
Brendan Donegan |
11 years ago
|
|
|
1860
|
|
|
Zygmunt Krynicki |
11 years ago
|
|
|
1859
|
|
Manual merge of plainbox unittest fixes
Tarmac makes launchpad smart server barf on this branch:
Using tree in /home/zyga/.cache/tarmac/branches/checkbox/trunk Firing tarmac_pre_merge hookphase:Apply phase 2/3 Preparing to merge lp:~zkrynicki/checkbox/zyga An error occurred trying to merge lp:checkbox: Server sent an unexpected error: ('error', 'GhostRevisionsHaveNoRevno', 'Could not determine revno for {zygmunt.krynicki@canonical.com-20130102112951-rcznu4o5raq9ixmh} because its ancestry shows a ghost at {launchpad_translations_on_behalf_of_checkbox-dev-20121225043543-tyj9c3lj1jiyf6mw}') Traceback (most recent call last): File "./bin/tarmac", line 6, in <module> main() File "/home/zyga/tarmac/tarmac/bin/__init__.py", line 30, in main registry.run(args) File "/home/zyga/tarmac/tarmac/bin/registry.py", line 60, in run self._run(args) File "/home/zyga/tarmac/tarmac/bin/registry.py", line 48, in _run run_bzr(args) File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr ret = run(*run_argv) File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases return self.run(**all_cmd_args) File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run return self._operation.run_simple(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple self.cleanups, self.func, *args, **kwargs) File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups result = func(*args, **kwargs) File "/home/zyga/tarmac/tarmac/bin/commands.py", line 370, in run self._do_merges(branch) File "/home/zyga/tarmac/tarmac/bin/commands.py", line 212, in _do_merges str(proposal.reviewed_revid)) File "<string>", line 4, in revision_id_to_revno_read_locked File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 3880, in revision_id_to_revno self._remote_path(), revision_id) File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 75, in _call self._translate_error(err, **err_context) File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 3452, in _translate_error self.repository._translate_error(err, branch=self, **context) File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 1347, in _translate_error self.bzrdir._translate_error(err, repository=self, **context) File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 491, in _translate_error _translate_error(err, bzrdir=self, **context) File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 4189, in _translate_error raise errors.UnknownErrorFromSmartServer(err) bzrlib.errors.UnknownErrorFromSmartServer: Server sent an unexpected error: ('error', 'GhostRevisionsHaveNoRevno', 'Could not determine revno for {zygmunt.krynicki@canonical.com-20130102112951-rcznu4o5raq9ixmh} because its ancestry shows a ghost at {launchpad_translations_on_behalf_of_checkbox-dev-20121225043543-tyj9c3lj1jiyf6mw}')
|
Zygmunt Krynicki |
11 years ago
|
|
|
1858
|
|
|
Launchpad Translatio... |
11 years ago
|
|
|
1857
|
|
|
Sylvain Pineau |
11 years ago
|
|
|
1856
|
|
|
Sylvain Pineau |
11 years ago
|
|
|
1855
|
|
|
Sylvain Pineau |
11 years ago
|
|
|
1854
|
|
|
Launchpad Translatio... |
11 years ago
|
|
|
1853
|
|
|
Sylvain Pineau |
11 years ago
|
|
|
1852
|
|
|
Brendan Donegan |
11 years ago
|
|
|
1851
|
|
|
Daniel Manrique |
11 years ago
|
|
|
1850
|
|
|
Daniel Manrique |
11 years ago
|
|
|
1849
|
|
|
Daniel Manrique |
11 years ago
|
|
|
1848
|
|
|
Daniel Manrique |
11 years ago
|
|
|
1847
|
|
|
Sylvain Pineau |
11 years ago
|
|
|
1846
|
|
|
Brendan Donegan |
11 years ago
|
|
|
1845
|
|
|
Daniel Manrique |
11 years ago
|
|
|
1844
|
|
|
Jeff Lane |
11 years ago
|
|
|