kicad-developers team mailing list archive

[Dick Hollenbeck <dick@xxxxxxxxxxx>]

On 06/30/2010 12:40 PM, Alex Leone wrote:
> A similar thing happened with inkscape development and bzr.  I don't
> know what the fix was but here's the "Proper way of merging":
>
> http://wiki.inkscape.org/wiki/index.php/Working_with_Bazaar#Proper_way_of_merging
>
>  - Alex
>   


This "Inkscape Best Practices" scheme requires complete duplication of
the working area.  Anybody aware of any alternatives which preserve the
revision history using a single personal branch (which is not a checkout)?



Thanks,

Dick