Something went wrong with this:
$ bzr merge lp:~statik/ubuntu/lucid/protobuf/merge-bug502654
Warning: criss-cross merge encountered. See bzr help criss-cross.
+N debian/patches/
+N debian/patches/series.OTHER
M debian/changelog
R debian/patches/ => debian/patches.moved/
R debian/patches/default_python_version =>
debian/patches/default_python_version
R debian/patches/no_death_tests_on_ia64 =>
debian/patches/no_death_tests_on_ia64
RM debian/patches/series => debian/patches.moved/series.THIS
Text conflict in debian/changelog
Conflict adding files to debian/patches. Created directory.
Conflict because debian/patches is not versioned, but has versioned children.
Versioned directory.
Conflict adding file debian/patches. Moved existing file to
debian/patches.moved.
Contents conflict in debian/patches.moved/series
Contents conflict in debian/patches/series
6 conflicts encountered.
--
Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
https://bugs.launchpad.net/bugs/502654
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
