On Tue, Oct 20, 2009 at 11:04:10PM +0200, Gianluca Montecchi wrote: > On Tue, Oct 06, 2009 at 08:21:54AM -0400, W. Trevor King wrote: > > I dunno what would cause this behavior, but merging your branch > > involved reverting a lot of unchanged files that bzr though were > > different... > > The problem is kompare, the software I use to merge the branch. It > seems that it cannot handle very well the symlink, so it think that > there is some real files.
On Wed, Oct 21, 2009 at 01:25:55AM +0200, Gianluca Montecchi wrote: > I make some fix to your code: > ... > It is all pushed to my branch Aha, are you not using "bzr merge path/to/my/branch" to merge? Because I just pulled your branch, and bzr doesn't think you've merged my branch yet: wk...@thor:be.wtk$ bzr missing ../be.html/ You have 103 extra revision(s): ------------------------------------------------------------ revno: 441 ... I'm not sure what the proper method is for integrating kompare with bzr merges. Maybe Aaron can shed some light on that or point us in the right direction. The best I can think of would be to use "bzr merge path/to/my/branch" and then use kompare to view the output of "bzr diff". I have no kompare experience though, so it is quite possible I'm way off ;). Trevor -- This email may be signed or encrypted with GPG (http://www.gnupg.org). The GPG signature (if present) will be attached as 'signature.asc'. For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy My public key is at http://www.physics.drexel.edu/~wking/pubkey.txt
pgp0EiYtbuX7d.pgp
Description: PGP signature
_______________________________________________ Be-devel mailing list [email protected] http://void.printf.net/cgi-bin/mailman/listinfo/be-devel
