interactive merge (was Re: [ANN][PLUGIN] extending diff with graphical tools)

[Robert Collins]

On Wed, 2006-05-03 at 18:52 +1000, Martin Pool wrote:
> On 01/05/2006, at 6:28 AM, John Arbash Meinel wrote:
> 
> > Though I know I would prefer a more streamlined workflow overall.  
> > Right
> > now I do a merge, see the list of conflicts, and then edit the first
> > one, and resolve it. Then the second... Then I type 'bzr conflicts'
> > again because the list has scrolled out of site, and keep repeating  
> > it.
> >
> > It would be nice if I could spawn an editor for each conflicted file,
> > and when that file is saved, the file is marked as resolved.
> > But I can see that as yet another plugin, rather than a core thing (at
> > least in the beginning)
> 
> I tend to run
> 
>    vim `bzr conflicts`

This is broken now, bzr conflicts returns more than just the filenames.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060503/128f20fa/attachment.pgp