w-changeset: merge errors out

[John Dong]

Also, can you modify your setup.py to install bzrlib.changeset and any other
sub-modules?

On 5/20/06, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
>
> John Dong wrote:
> > I'm not sure if it's a bug... but I just cloned a copy of your
> > w-changeset branch and tried to use it to merge from bzr.dev, and got
> this:
> >
> > jdong at jdong-laptop:~/src/bzr/w-changeset$ ./bzr merge ../bzr.dev
> > bzr: ERROR: exceptions.IOError: [Errno 21] Is a directory
> >   at /home/jdong/src/bzr/w-changeset/bzrlib/builtins.py line 1957
> >   in run
>
> Thanks.  Fixed.
>
> Aaron
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20060520/3f696d96/attachment.htm