Lots of conflicts when trying to merge protobuf to maverick

[Elliot Murphy]

Hi!

I took a look at merge protobuf from sid just now, and was surprised
to see a lot of conflicts.

What is the right way to get this merging smoothly again? The
differences from debian should be very minor, a single patch file and
the normal stuff in changelog and control.
Is this a bug in the bzr merge-package command?

Thanks for your advice, full recipe below:

bzr get lp:ubuntu/maverick/protobuf; cd protobuf
bzr merge-package lp:debian/sid/protobuf

gives me:
Text conflict in debian/control
Contents conflict in debian/libprotoc-dev.install
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/series
Contents conflict in editors/protobuf-mode.el
Conflict adding files to gtest.  Created directory.
Conflict because gtest is not versioned, but has versioned children.
Versioned directory.
Conflict adding file gtest.  Moved existing file to gtest.moved.
Contents conflict in gtest/CHANGES
Contents conflict in gtest/CONTRIBUTORS
Contents conflict in gtest/Makefile.am
Contents conflict in gtest/Makefile.in
Contents conflict in gtest/README
Contents conflict in gtest/configure
Contents conflict in gtest/configure.ac
Conflict adding files to gtest/include.  Created directory.
Conflict because gtest/include is not versioned, but has versioned
children.  Versioned directory.
Conflict adding files to gtest/include/gtest.  Created directory.
Conflict because gtest/include/gtest is not versioned, but has
versioned children.  Versioned directory.
Contents conflict in gtest/include/gtest/gtest-death-test.h
Contents conflict in gtest/include/gtest/gtest-spi.h
Contents conflict in gtest/include/gtest/gtest-test-part.h
Contents conflict in gtest/include/gtest/gtest.h
Conflict adding files to gtest/include/gtest/internal.  Created directory.
Conflict because gtest/include/gtest/internal is not versioned, but
has versioned children.  Versioned directory.
Contents conflict in gtest/include/gtest/internal/gtest-death-test-internal.h
Contents conflict in gtest/include/gtest/internal/gtest-internal.h
Contents conflict in gtest/include/gtest/internal/gtest-param-util-generated.h
Contents conflict in
gtest/include/gtest/internal/gtest-param-util-generated.h.pump
Contents conflict in gtest/include/gtest/internal/gtest-param-util.h
Contents conflict in gtest/include/gtest/internal/gtest-port.h
Contents conflict in gtest/include/gtest/internal/gtest-string.h
Conflict adding files to gtest/msvc.  Created directory.
Conflict because gtest/msvc is not versioned, but has versioned
children.  Versioned directory.
Contents conflict in gtest/msvc/gtest.sln
Contents conflict in gtest/msvc/gtest.vcproj
Contents conflict in gtest/msvc/gtest_main.vcproj
Contents conflict in gtest/msvc/gtest_prod_test.vcproj
Contents conflict in gtest/msvc/gtest_unittest.vcproj
Conflict adding files to gtest/samples.  Created directory.
Conflict because gtest/samples is not versioned, but has versioned
children.  Versioned directory.
Conflict adding files to gtest/scons.  Created directory.
Conflict because gtest/scons is not versioned, but has versioned
children.  Versioned directory.
Contents conflict in gtest/scons/SConscript
Conflict adding files to gtest/scripts.  Created directory.
Conflict because gtest/scripts is not versioned, but has versioned
children.  Versioned directory.
Contents conflict in gtest/scripts/gen_gtest_pred_impl.py
Conflict adding files to gtest/src.  Created directory.
Conflict because gtest/src is not versioned, but has versioned
children.  Versioned directory.
Contents conflict in gtest/src/gtest-death-test.cc
Contents conflict in gtest/src/gtest-filepath.cc
Contents conflict in gtest/src/gtest-internal-inl.h
Contents conflict in gtest/src/gtest-port.cc
Contents conflict in gtest/src/gtest-test-part.cc
Contents conflict in gtest/src/gtest.cc
Conflict adding files to gtest/test.  Created directory.
Conflict because gtest/test is not versioned, but has versioned
children.  Versioned directory.
Contents conflict in gtest/test/gtest-death-test_test.cc
Contents conflict in gtest/test/gtest-filepath_test.cc
Contents conflict in gtest/test/gtest-options_test.cc
Contents conflict in gtest/test/gtest-port_test.cc
Contents conflict in gtest/test/gtest-test-part_test.cc
Contents conflict in gtest/test/gtest-typed-test_test.cc
Contents conflict in gtest/test/gtest_env_var_test.py
Contents conflict in gtest/test/gtest_filter_unittest_.cc
Contents conflict in gtest/test/gtest_repeat_test.cc
Contents conflict in gtest/test/gtest_stress_test.cc
Contents conflict in gtest/test/gtest_unittest.cc
Contents conflict in gtest/test/gtest_xml_output_unittest.py
Contents conflict in gtest/test/gtest_xml_output_unittest_.cc
Contents conflict in gtest/test/gtest_xml_test_utils.py
Conflict adding files to gtest/xcode.  Created directory.
Conflict because gtest/xcode is not versioned, but has versioned
children.  Versioned directory.
Conflict adding files to gtest/xcode/Config.  Created directory.
Conflict because gtest/xcode/Config is not versioned, but has
versioned children.  Versioned directory.
Contents conflict in gtest/xcode/Config/FrameworkTarget.xcconfig
Conflict adding files to gtest/xcode/Samples.  Created directory.
Conflict because gtest/xcode/Samples is not versioned, but has
versioned children.  Versioned directory.
Conflict adding files to gtest/xcode/Samples/FrameworkSample.  Created
directory.
Conflict because gtest/xcode/Samples/FrameworkSample is not versioned,
but has versioned children.  Versioned directory.
Conflict adding files to
gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj.
Created directory.
Conflict because
gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj is not
versioned, but has versioned children.  Versioned directory.
Contents conflict in
gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
Conflict adding files to gtest/xcode/Scripts.  Created directory.
Conflict because gtest/xcode/Scripts is not versioned, but has
versioned children.  Versioned directory.
Contents conflict in gtest/xcode/Scripts/runtests.sh
Conflict adding files to gtest/xcode/gtest.xcodeproj.  Created directory.
Conflict because gtest/xcode/gtest.xcodeproj is not versioned, but has
versioned children.  Versioned directory.
Contents conflict in gtest/xcode/gtest.xcodeproj/project.pbxproj
Contents conflict in m4/acx_check_suncc.m4
Contents conflict in src/google/protobuf/stubs/once.cc
Contents conflict in src/google/protobuf/stubs/once.h
Contents conflict in src/google/protobuf/stubs/once_unittest.cc
95 conflicts encountered.
The merge resulted in 95 conflicts. Please resolve these and commit
the changes with "bzr commit".



-- 
Elliot Murphy | https://launchpad.net/~statik/