Package: bazaar
Version: 1.5~200507280705
Severity: normal
A 'baz merge' reports conflicts but fails to show what are the
conflicts. 'baz status' does show the conflict though.
eve:[~/Debian/tap-plugins/config--tap-plugins]% baz merge
[EMAIL PROTECTED]/config--debian--0
* Scanning for full-tree revision ... done.
* from revision library (linking):
* [EMAIL PROTECTED]/config--zeroconf--0--patch-4
* Applying 2 revisions .. done.
* Searching for best merge point .. done
* merge by
* delta([EMAIL PROTECTED]/config--debian--0--patch-1,[EMAIL
PROTECTED]/config--debian--0--patch-8)[/home/anand/Debian/tap-plugins/config--tap-plugins]
* performing merge
* Comparing FROM and TO .................. done.
* Merging into tree
=> .arch-ids/tap-plugins.cfg.id .arch-ids/zeroconf.cfg.id
=> tap-plugins.cfg zeroconf.cfg
A .arch-ids/.arch-inventory.id
A .arch-inventory
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-2
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-4
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-5
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-6
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-7
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-8
A {arch}/config/config--zeroconf/config--zeroconf--0/[EMAIL
PROTECTED]/patch-log/patch-5
A {arch}/config/config--zeroconf/config--zeroconf--0/[EMAIL
PROTECTED]/patch-log/patch-6
A {arch}/config/config--zeroconf/config--zeroconf--0/[EMAIL
PROTECTED]/patch-log/patch-7
A {arch}/config/config--zeroconf/config--zeroconf--0/[EMAIL
PROTECTED]/patch-log/patch-8
A {arch}/config/config--zeroconf/config--zeroconf--0/[EMAIL
PROTECTED]/patch-log/patch-9
M Makefile
M dpkg-buildpackage
M zeroconf.cfg
********************************************************
* 1 conflicted items in this tree. Please *
* resolve each conflict with "baz resolved 'filename'" *
********************************************************
eve:[~/Debian/tap-plugins/config--tap-plugins]% ls
{arch} Makefile
zeroconf.cfg
dpkg-buildpackage +removed-conflict-files.1122620820.7176.28
eve:[~/Debian/tap-plugins/config--tap-plugins]% find
+removed-conflict-files.1122620820.7176.28
+removed-conflict-files.1122620820.7176.28
+removed-conflict-files.1122620820.7176.28/Makefile.orig
eve:[~/Debian/tap-plugins/config--tap-plugins]% baz status
* looking for
* [EMAIL PROTECTED]/config--tap-plugins--0--patch-1 to
* compare with
* comparing to
* [EMAIL PROTECTED]/config--tap-plugins--0--patch-1
A {arch}/config/config--debian
A {arch}/config/config--debian/config--debian--0
A {arch}/config/config--debian/config--debian--0/[EMAIL PROTECTED]
A {arch}/config/config--debian/config--debian--0/[EMAIL PROTECTED]/patch-log
A .arch-ids/.arch-inventory.id
A .arch-inventory
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/base-0
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-1
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-2
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-4
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-5
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-6
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-7
A {arch}/config/config--debian/config--debian--0/[EMAIL
PROTECTED]/patch-log/patch-8
A {arch}/config/config--zeroconf/config--zeroconf--0/[EMAIL
PROTECTED]/patch-log/patch-5
A {arch}/config/config--zeroconf/config--zeroconf--0/[EMAIL
PROTECTED]/patch-log/patch-6
A {arch}/config/config--zeroconf/config--zeroconf--0/[EMAIL
PROTECTED]/patch-log/patch-7
A {arch}/config/config--zeroconf/config--zeroconf--0/[EMAIL
PROTECTED]/patch-log/patch-8
A {arch}/config/config--zeroconf/config--zeroconf--0/[EMAIL
PROTECTED]/patch-log/patch-9
R .arch-ids/tap-plugins.cfg.id => .arch-ids/zeroconf.cfg.id
R tap-plugins.cfg => zeroconf.cfg
M Makefile
M dpkg-buildpackage
M zeroconf.cfg
C Makefile
eve:[~/Debian/tap-plugins/config--tap-plugins]%
Anand
-- System Information:
Debian Release: testing/unstable
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12suspend-2.1.9
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
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 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
bazaar recommends no packages.
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
