"W. Trevor King" <[email protected]> writes: > On Tue, Oct 20, 2009 at 11:04:10PM +0200, Gianluca Montecchi wrote: > > 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.
[…] > 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 ;). Yes, ‘bzr merge’ should be used to merge. The result will be that the revision data will be included in the current branch, and the working tree will be updated with the result of an *automated* merge done by Bazaar; but importantly the working tree state is *not* yet committed. This is where an interactive merge tool (like ‘kompare’ or, my current favourite, ‘diffuse’) steps in: you can view the result of the automated merge, comparing the resulting working tree state against the tip of the branch, and decide on further changes before finally doing ‘bzr commit’. -- \ “Tis more blessed to give than to receive; for example, wedding | `\ presents.” —Henry L. Mencken | _o__) | Ben Finney
pgp2aTrm3epFn.pgp
Description: PGP signature
_______________________________________________ Be-devel mailing list [email protected] http://void.printf.net/cgi-bin/mailman/listinfo/be-devel
