Package: bazaar Version: 1.4.1-1 Severity: wishlist It would rock if I could just say
baz resolve --source file.c and have it resolve a conflict by overwriting my local version with the one from the merge source. Similarly, baz resolve --tree file.c would discard the merge source copy and give preference to my local one. Both commands would call `baz resolved` implicitly. -- System Information: Debian Release: 3.1 APT prefers testing APT policy: (600, 'testing'), (98, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.11-cirrus Locale: LANG=en_GB, LC_CTYPE=en_GB.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 -- no debconf information -- .''`. martin f. krafft <[EMAIL PROTECTED]> : :' : proud Debian developer and author: http://debiansystem.info `. `'` `- Debian - when you have better things to do than fixing a system Invalid/expired PGP (sub)keys? Use subkeys.pgp.net as keyserver! "a mac is like a prostitute. sure they look good, but your wallet will feel a lot lighter after getting one." -- psychonate on irc
signature.asc
Description: Digital signature
