Package: bazaar
Version: 1.5~200507151229
Severity: normal
In a conflicted tree, if you then subsquently 'baz mv' a conflicted
file, baz status will report the original filename.
I think 'baz mv' should also rename the file in {arch}/+conflicts.
Cheers,
Anand
Example:
eve:[~/Debian/gtk-gnutella/config--gtk-gnutella]% baz merge
[EMAIL PROTECTED]/config--debian--0
* Searching for best merge point ........ done
* merge by
* delta([EMAIL PROTECTED]/config--zeroconf--0--patch-4,[EMAIL
PROTECTED]/config--debian--0--patch-7)[/home/anand/Debian/gtk-gnutella/config--gtk-gnutella]
* performing merge
* Comparing FROM and TO ................... done.
* Merging into tree
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
=> .arch-ids/gtk-gnutella.cfg.id .arch-ids/template.cfg.id
=> gtk-gnutella.cfg template.cfg
CA .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-3
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
C Makefile
=M dpkg-buildpackage
C template.cfg
********************************************************
* 3 conflicted items in this tree. Please *
* resolve each conflict with "baz resolved 'filename'" *
********************************************************
eve:[~/Debian/gtk-gnutella/config--gtk-gnutella]% baz status
Tree is not lint clean. Unable to continue past this point
These apparent source files lack inventory ids:
.arch-inventory
eve:[~/Debian/gtk-gnutella/config--gtk-gnutella]% baz add
.arch-inventory
eve:[~/Debian/gtk-gnutella/config--gtk-gnutella]% baz status
* looking for
* [EMAIL PROTECTED]/config--gtk-gnutella--0.95.3--patch-1 to
* compare with
* comparing to
* [EMAIL PROTECTED]/config--gtk-gnutella--0.95.3--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-3
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
R .arch-ids/gtk-gnutella.cfg.id => .arch-ids/template.cfg.id
R gtk-gnutella.cfg => template.cfg
M Makefile
M dpkg-buildpackage
M template.cfg
C .arch-ids/.arch-inventory.id
C Makefile
C template.cfg
eve:[~/Debian/gtk-gnutella/config--gtk-gnutella]% baz mv template.cfg
gtk-gnutella.cfg
eve:[~/Debian/gtk-gnutella/config--gtk-gnutella]% baz status
* looking for [EMAIL PROTECTED]/config--gtk-gnutella--0.95.3--patch-1 to
compare with
* comparing to [EMAIL PROTECTED]/config--gtk-gnutella--0.95.3--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-3
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
M Makefile
M dpkg-buildpackage
C .arch-ids/.arch-inventory.id
C template.cfg
eve:[~/Debian/gtk-gnutella/config--gtk-gnutella]% ls -l *.cfg
-rw-rw-r-- 1 anand anand 230 2005-07-18 22:41 gtk-gnutella.cfg
-- 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]
