Package: bazaar Version: 1.4.2-0+vagrant.0 Severity: normal i'm using a version of bazaar built from the debian sources for 1.4.2-1, but built on a sarge system to use sarge dependencies (i was also having similar issues with the version in sarge, 1.1.1-1)
with repository [EMAIL PROTECTED]/ltsp--debianfixes--0--patch-29, when i try: baz merge [EMAIL PROTECTED]/ltsp--debian--0--patch-116 i get a conflict on debian/changelog, even though i have made no modifications to that file on my branch since the last time i attempted to merge. (this has also happened on previous merge attempts as well, and resolved by manually copying the debian/changelog from pere's branch into mine before committing) however, when i merge each patch since the last merge, i end up with no conflicts. for example: baz merge [EMAIL PROTECTED]/ltsp--debian--0--patch-110 baz merge [EMAIL PROTECTED]/ltsp--debian--0--patch-111 baz merge [EMAIL PROTECTED]/ltsp--debian--0--patch-112 baz merge [EMAIL PROTECTED]/ltsp--debian--0--patch-113 baz merge [EMAIL PROTECTED]/ltsp--debian--0--patch-114 baz merge [EMAIL PROTECTED]/ltsp--debian--0--patch-115 baz merge [EMAIL PROTECTED]/ltsp--debian--0--patch-116 results in no conflicts, but that's a lot of typing :( thanks for maintaining bazaar :) live well, vagrant -- System Information: Debian Release: 3.1 Architecture: i386 (i586) Kernel: Linux 2.6.8-2-386 Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1) Versions of packages bazaar depends on: ii diff 2.8.1-11 File comparison utilities ii gawk 1:3.1.4-2 GNU awk, a pattern scanning and pr ii libc6 2.3.2.ds1-22 GNU C Library: Shared libraries an ii libexpat1 1.95.8-3 XML parsing C library - runtime li ii libgpgme11 1.0.2-1 GPGME - GnuPG Made Easy ii libneon24 0.24.7.dfsg-2 An HTTP and WebDAV client library ii libssl0.9.7 0.9.7e-3 SSL shared libraries ii patch 2.5.9-2 Apply a diff file to an original -- no debconf information
signature.asc
Description: Digital signature
