[MERGE/RFC] Merge in clean-tree
Jelmer Vernooij
jelmer at samba.org
Mon Mar 9 21:27:56 GMT 2009
Hi Aaron,
On Mon, 2009-03-09 at 14:42 +1000, Aaron Bentley wrote:
> Jelmer Vernooij wrote:
> > The attached patch imports the clean-tree command from bzrtools, as
> > discussed a while back:
> >
> > https://lists.ubuntu.com/archives/bazaar/2008q3/045532.html
> >
> > It's not ready for inclusion yet; Aaron still owns the copyright, and
> > that should be signed over to Canonical IIUC. Aaron, would you be ok
> > with reassigning copyright? Does the rest of this patch look ok to you?
>
> Here's a revised version that assigns copyright, makes the tests not
> totally horrible on Windows, and fixes some whitespace issues.
Thanks!
> BTW, in the future, please start by merging bzrtools (or whatever
> project) into bzr, so that the annotations are preserved.
I'm sorry, I'll do that in the future. I did do a "bzr merge
~/bzrtools/clean_tree.py" to preserve the file id, but that didn't merge
any of the history obviously.
bb:approve
Cheers,
Jelmer
--
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 315 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090309/adc45635/attachment-0001.pgp
More information about the bazaar
mailing list