Error during merge: No final name for trans_id 'new-70'

[Thorsten Glaser]

On Tue, 18 Sep 2012, Aaron Bentley wrote:

> > Also, it would be very handy if bzr could resolve these types of 
> > conflicts automatically. Can bzr automatically ignore changes for
> > files which are removed in the target branch?
> 
> No, but you could certainly extend resolve or write a plugin to clean
> it up afterward.

That would be so awesome! I’m working on something where
I’d love to delete lots of junk (unused or even not DFSG-
free) from the code, but that makes merging a PITA.

On the other hand, I can imagine a situation where I’d
want to have the directory added back, so I’d probably
need that on a case-by-case basis. Or something like
deleted-subdirectories-to-ignore-on-merge=foo,bar/baz/*/bla,…

bye,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-314
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Boris Esser, Sebastian Mancke