[MERGE] don't show pending merges when given specific files

John Arbash Meinel john at arbash-meinel.com
Thu Mar 20 17:17:23 GMT 2008


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This is just a simple workaround for how slow "bzr status foo" can be after a merge.

Specifically, it just skips showing pending merges when paths are supplied. I
don't think it is worth the effort (yet) to actually figure out for all pending
merges which one actually effect the supplied files and filter them, which would
be more correct than showing all of them.

The patch was cheap to make, if people don't like it, that's fine. I think it is
an improvement, though.

I would still prefer it if displaying pending merges was faster, but this is a
nearly trivial workaround.

John
=:->

PS> (as a bit of a hack, if you do 'bzr status .' it will also skip pending
merges because '.' is specifying an explicit path check.)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH4pwjJdeBCYSNAAMRAs7jAJ4h3FwFW1SmRM2quWbMjJneZj/AvACfeeje
KTHOpcfQ+adZLJfg2J3ifOk=
=re8N
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: status_specific_files.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080320/95c9c08b/attachment-0001.diff 


More information about the bazaar mailing list