[MERGE] support non '.bzr' control directories better.

[Jelmer Vernooij]

On Wed, 2006-06-14 at 00:09 +1000, Robert Collins wrote:
> On Tue, 2006-06-13 at 16:04 +0200, Jelmer Vernooij wrote:
> > On Sun, 2006-06-04 at 12:58 +0100, Martin Pool wrote:
> > > On  1 Jun 2006, Robert Collins <robertc at robertcollins.net> wrote:
> > > > This should be useful for jelmer's SVN work, and was needed for my hg
> > > > plugin.
> > > > 
> > > > Branch is at
> > > > http://people.ubuntu.com/~robertc/baz2.0/non-bzr-control-dirs
> > > 
> > > About +0.5; you can merge it if you like but I'd like it simplified a
> > > bit.
> > 
> > The attached bundle fixes the issues raised in this thread. It makes 3
> > or 4 lines in doctests cross the 80-character boundary but I felt that
> > would be nicer than adding a doctest directive for ignoring whitespace.
> > Let me know if you disagree and I'll fix it :-)
> > 
> > Mergeable from http://samba.org/~jelmer/bzr/non-bzr-control-dirs
> 
> Thanks - not quite there yet - the set should be a list instead of a
> set.
Ok, here's the next attempt. Does this look better? 

Thanks for your patience :-)

Cheers,

Jelmer
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: non-bzr-control-dirs.bundle.diff
Type: text/x-patch
Size: 1277 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060613/48a528f2/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060613/48a528f2/attachment.pgp