> #64: cvs -> bzr conversion fails on adding files to non-existent directories

Heh, casually I run into this today as well.

>  Attached a patch to fix this in the Bzr target, but I'm not sure at all if
>  it's the right place. Perhaps it could be fixed in the CVS source?

This patch adds yet another loop of processing to bzr's _addPathnames(),
all because WorkingTree.add() is used to talk to bzrlib, instead of
smart_add_tree().

I was going to prepare a patch simplifying the function based on this,
but then I found about:

  committer: [EMAIL PROTECTED]
  timestamp: Mon 2005-12-26 09:43:27 +0000
  message:
    Do not use bzr's smart_add_tree as it ignores entries
    Also, do not add rename targets as they are already considered by bzr.
  modified:
    vcpx/bzr.py

Well, smart_add_tree() ignores files that match an ignore pattern, _only
if_ they were not explicitly passed as arguments, and are being added as
the result of recursing a directory.

Marien, I would like to know if your comment above referred only to that
case, or to something else. If it's only that, then I think it's much
better to invoke smart_add_tree() once, which returns the list of ignored
files, and invoke it again over that list.

#64 would get solved with this, and I'd say it'd be possible to simplify
a bit the preceding code too, eg. dealing with renames, since `bzr mv a
b; bzr add b` in the command line raises no error.

I still need to understand the issue behind changeset 1049, in order to
make sure that I introduce no regressions, but I wouldn't be surprised
if smart_add_tree() would handle it just fine by itself.

P.S.: Can one comment to tickets via mail?

Cheers,

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
                                       Listening to: ISAN - Amber Button

_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor

Reply via email to