ready to merge trunk over SAMBA_3_0 ?

[David Collier-Brown]

Andrew Bartlett wrote:
> It is an issue because of how much information we loose.  This is a
> particularly big merge, and I think we should take care to retain the
> history if we can.

   Actually I think you might lose history wit an svn rename.

   If the trunk contains all the individual updates done
to it, and SAMBA_3_0 contains the updates to it, adding a
big single update from trunk will retain both, albeit
in two places, while renaming trunk to SAMBA_3_0 will
arguably wipe out all the old history in trunk...

--dave
-- 
David Collier-Brown,      | Always do right. This will gratify
Sun Microsystems, Toronto | some people and astonish the rest
davecb at canada.sun.com     |                      -- Mark Twain
(416) 263-5733 (x65733)   |