lp:~aroth/kdev-python/trunk

Created by Andreas Roth and last modified
Get this branch:
bzr branch lp:~aroth/kdev-python/trunk

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Andreas Roth
Project:
kdev-python
Status:
Development

Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/kdev-python.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was .

Import started on alnitak and finished taking 15 seconds — see the log
Import started on alnitak and finished taking 15 seconds — see the log
Import started on alnitak and finished taking 15 seconds — see the log
Import started on izar and finished taking 15 seconds — see the log

Recent revisions

1818. By Luca Beltrame <email address hidden>

Merge branch '5.2'

1817. By l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

1816. By l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

1815. By l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

1814. By Kevin Funk

usebuilder: Adapt to change in kdevplatform

1813. By Kevin Funk

Merge remote-tracking branch 'origin/5.2'

1812. By Kevin Funk

Attempt to fix Windows build

Error:
  CMake Error: Could not open file for write in copy operation /kdevphpversion.h.tmp

1811. By l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

1810. By l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

1809. By l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.

Subscribers

No subscribers.