launchpad-dev team mailing list archive

[Jonathan Lange <jml@xxxxxxxxxxxxx>]

On Wed, Apr 14, 2010 at 6:28 PM, Jonathan Lange <jml@xxxxxxxxxxxxx> wrote:
> On Wed, Apr 14, 2010 at 6:25 PM, Launchpad Patch Queue Manager
> <launchpad@xxxxxxxxxxxxxxxxx> wrote:
>>
>> merge bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/db-devel
>> Command failed!
>> All lines of log output:
>> Executing star-merge bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable at Wed Apr 14 18:23:18 2010
>> Conflicts during merge: Text conflict in lib/lp/code/model/branchtarget.pyText conflict in lib/lp/code/stories/webservice/xx-code-import.txt
>>
>
> I'll get it.
>

Fixed. "Downtime" roughly 1hr 25m.

jml