Ticket #25 (closed defect: fixed)

Opened 7 years ago

Last modified 7 years ago

various bzr changes

Reported by: marienz@… Owned by: lele
Priority: major Milestone: VersionOne
Component: tailor Version: 0.9
Keywords: Cc:

Description

There's a couple of changes that make a svn -> bzr conversion work better for me. I'm going to (hopefully, depends on if I can get darcs to spit them out for me :) attach some patches, along with tailor configfiles demonstrating the problems they get around.

Attachments

tailor-bzr.dev-compat.patch Download (541 bytes) - added by marienz@… 7 years ago.
compatibility with bzr.dev (what will be bzr 0.7)
savior.tailor Download (275 bytes) - added by marienz@… 7 years ago.
tailor config file that converts svn -> bzr, exposing some bugs
tailor-no-smart_add_tree.patch Download (2.3 KB) - added by marienz@… 7 years ago.
don't use smart_add_tree, it ignores stuff
tailor-ignore-moved.patch Download (778 bytes) - added by marienz@… 7 years ago.
Don't try to add moved files

Change History

Changed 7 years ago by marienz@…

compatibility with bzr.dev (what will be bzr 0.7)

comment:1 Changed 7 years ago by marienz@…

The better-initial-import patch avoids the use of smart_add_subtree, which has the annoying habit of not versioning what bzr considers "generated" files, like aclocal.m4, even if it is versioned in the source repo. Changes later on to such a file trigger a NotVersionedError?. The attached savior.tailor should trigger this on aclocal.m4.

Changed 7 years ago by marienz@…

tailor config file that converts svn -> bzr, exposing some bugs

Changed 7 years ago by marienz@…

don't use smart_add_tree, it ignores stuff

comment:2 Changed 7 years ago by anonymous

If you run savior.tailor after applying no-smart_add_tree it should fail a bit later on because it attempts to add a file it just moved. You can change start-revision to 2244 to speed things up a bit. The next patch takes care of that by making _addPathNames ignore moved entries as well as added ones.

With both patches applied tailor should be capable of importing the entire savior repo.

Changed 7 years ago by marienz@…

Don't try to add moved files

comment:3 Changed 7 years ago by marienz@…

Finally I'd like to point out I'm not familiar with tailor's or bzr's internals, I just changed things so that it apparently successfully imported a repo. Some review of this stuff wouldn't hurt :)

comment:4 Changed 7 years ago by lele

Thank you, I'll do!

comment:5 Changed 7 years ago by Lele Gaifax

  • Status changed from new to closed
  • Resolution set to fixed

All the patches above are now applied. Please check it out and confirm the everything keeps moving in the right direction :)

Note: See TracTickets for help on using tickets.