<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"> <HTML> <HEAD> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8"> <META NAME="GENERATOR" CONTENT="GtkHTML/3.18.1"> </HEAD> <BODY> Hello, I have some nice puzzle for you folks. There is a project called <A HREF="specto.sf.net">Specto</A>, which, across its lifetime, used 3 different version control systems. Those are CVS, Subversion and Bazaar. And each time, we did not keep the history. <OL TYPE=1> <LI TYPE=1 VALUE=1>cvs: <A HREF="https://code.launchpad.net/~vcs-imports/specto/cvs-main">https://code.launchpad.net/~vcs-imports/specto/cvs-main</A> <LI TYPE=1 VALUE=2>svn: <A HREF="http://specto.googlecode.com/svn/trunk/">http://specto.googlecode.com/svn/trunk/</A> <LI TYPE=1 VALUE=3>bzr: <A HREF="https://code.launchpad.net/~woutc/specto/specto-woutc">https://code.launchpad.net/~woutc/specto/specto-woutc</A> </OL> Those are the various repositories that have been used for developing Specto, from the oldest to the newest. In theory, the code should be compatible, it's just that we did not migrate the history metadata between them. Current situation summary: <UL> <LI>the ability to upgrade to the rich-root-pack repository format was recently fixed in bzr.dev (https://bugs.launchpad.net/bzr/+bug/177874), I tried and it indeed works <LI>I was told that rich-root-pack would eventually become the default format <LI>it is impossible to merge r-r-p into pack-0.92 because pack-0.92 is inferior <LI>therefore for specto-main (The One Branch to Rule the All and in Darkness Bind Them, the one which will retain cvs, svn and bzr history) we need to use r-r-p if I am not mistaken </UL> What I did so far <UL> <LI TYPE=1 VALUE=1>branch specto-cvs: bzr branch http://bazaar.launchpad.net/~vcs-imports/specto/cvs-main "specto-main" <LI TYPE=1 VALUE=2>upgrade it to rich root pack: cd specto-main && bzr upgrade --rich-root-pack <LI TYPE=1 VALUE=3>merge specto-svn using bzr-svn (if you want the job already done, just try merging from this temporary branch: bzr merge -r0..85 <A HREF="http://bazaar.launchpad.net/~kiddo/specto/specto-svn">http://bazaar.launchpad.net/~kiddo/specto/specto-svn</A> ) <LI TYPE=1 VALUE=4>eventually (this is where I am stuck/worried), bzr merge -r0..66 http://bazaar.launchpad.net/~woutc/specto/specto-woutc </UL> Between each disparate branch (cvs-svn-woutc), I needed to to something like bzr merge -r0..85, because they have a discontinuous history after all. And here comes the problem/fun part: merging specto-svn into specto-main (the cvs version at that point) created 4 conflicts (which I resolved by removing all the .moved files, they seemed pretty much harmless, I wondered why it even spurred conflicts), then, merging specto-woutc into specto-main (which is now specto-cvs+svn) gives 7 conflicts. HOWEVER, the thing that scares me is this: <TT>jeff@khloe:~/trunks/awesome-new-specto/specto-main$ bzr merge ../specto-woutc/ -r0..66</TT> <TT>+N data/ </TT> <TT>+N data/doc/</TT> <TT>+N data/doc/AUTHORS</TT> <TT>+N data/doc/COPYING</TT> <TT>+N data/doc/ChangeLog</TT> <TT>+N data/doc/HACKING</TT> <TT>+N data/doc/INSTALL</TT> <TT>+N data/doc/VERSION</TT> <TT>+N data/glade/</TT> <TT>+N data/glade/add_watch.glade</TT> <TT>+N data/glade/edit_watch.glade</TT> <TT>+N data/glade/import_export.glade</TT> <TT>+N data/glade/log_dialog.glade</TT> <TT>+N data/glade/notifier.glade</TT> <TT>+N data/glade/preferences.glade</TT> <TT>+N data/icons/</TT> <TT>+N data/icons/hicolor/</TT> <TT>+N data/icons/hicolor/scalable/</TT> <TT>+N data/icons/hicolor/scalable/specto.svg</TT> <TT>+N data/icons/specto_about.png</TT> <TT>+N data/icons/specto_tray_1.png</TT> <TT>+N data/icons/specto_tray_1.svg</TT> <TT>+N data/icons/specto_tray_2.png</TT> <TT>+N data/icons/specto_tray_2.svg</TT> <TT>+N data/icons/specto_window_icon.png</TT> <TT>+N data/icons/specto_window_icon.svg</TT> <TT>+N launch.sh</TT> <TT>+N po/</TT> <TT>+N po/cs/</TT> <TT>+N po/cs/specto.mo</TT> <TT>+N po/cs/specto.po</TT> <TT>+N po/de/</TT> <TT>+N po/de/specto.mo</TT> <TT>+N po/de/specto.po</TT> <TT>+N po/es/</TT> <TT>+N po/es/specto.mo</TT> <TT>+N po/es/specto.po</TT> <TT>+N po/fr/</TT> <TT>+N po/fr/specto.mo</TT> <TT>+N po/fr/specto.po</TT> <TT>+N po/generate_template.py</TT> <TT>+N po/it/</TT> <TT>+N po/it/specto.mo</TT> <TT>+N po/it/specto.po</TT> <TT>+N po/pt_BR/</TT> <TT>+N po/pt_BR/specto.mo</TT> <TT>+N po/pt_BR/specto.po</TT> <TT>+N po/pygettext.py</TT> <TT>+N po/ro/</TT> <TT>+N po/ro/specto.mo</TT> <TT>+N po/ro/specto.po</TT> <TT>+N po/specto.pot</TT> <TT>+N po/sv/</TT> <TT>+N po/sv/specto.mo</TT> <TT>+N po/sv/specto.po</TT> <TT>+N po/tarball_rosetta.sh</TT> <TT>+N po/tr/</TT> <TT>+N po/tr/specto.mo</TT> <TT>+N po/tr/specto.po</TT> <TT>+N setup.py</TT> <TT>+N spectlib/</TT> <TT>+N spectlib/__init__.py</TT> <TT>+N spectlib/about.py</TT> <TT>+N spectlib/add_watch.py</TT> <TT>+N spectlib/balloons.py</TT> <TT>+N spectlib/config.py</TT> <TT>+N spectlib/console.py</TT> <TT>+N spectlib/edit_watch.py</TT> <TT>+N spectlib/export_watch.py</TT> <TT>+N spectlib/gtkconfig.py</TT> <TT>+N spectlib/i18n.py</TT> <TT>+N spectlib/i18n_safedict.py</TT> <TT>+N spectlib/import_watch.py</TT> <TT>+N spectlib/logger.py</TT> <TT>+N spectlib/main.py</TT> <TT>+N spectlib/notifier.py</TT> <TT>+N spectlib/plugins/</TT> <TT>+N spectlib/plugins/__init__.py</TT> <TT>+N spectlib/plugins/watch_mail_gmail.py</TT> <TT>+N spectlib/plugins/watch_mail_imap.py</TT> <TT>+N spectlib/plugins/watch_mail_pop3.py</TT> <TT>+N spectlib/plugins/watch_system_folder.py</TT> <TT>+N spectlib/plugins/watch_system_port.py</TT> <TT>+N spectlib/plugins/watch_system_process.py</TT> <TT>+N spectlib/plugins/watch_web_greader.py</TT> <TT>+N spectlib/plugins/watch_web_static.py</TT> <TT>+N spectlib/preferences.py</TT> <TT>+N spectlib/test/</TT> <TT>+N spectlib/test/__init__.py</TT> <TT>+N spectlib/test/test_networkmanager.py</TT> <TT>+N spectlib/tools/</TT> <TT>+N spectlib/tools/__init__.py</TT> <TT>+N spectlib/tools/iniparser.py</TT> <TT>+N spectlib/tools/networkmanager.py</TT> <TT>+N spectlib/tools/specto_gconf.py</TT> <TT>+N spectlib/trayicon.py</TT> <TT>+N spectlib/util.py</TT> <TT>+N spectlib/watch.py</TT> <TT>+N specto</TT> <TT>+N specto.desktop</TT> <TT>R data/ => data.moved/</TT> <TT>R launch.sh => launch.sh.moved</TT> <TT>R po/ => po.moved/</TT> <TT>R setup.py => setup.py.moved</TT> <TT>R spectlib/ => spectlib.moved/</TT> <TT>R specto => specto.moved</TT> <TT>R specto.desktop => specto.desktop.moved</TT> <TT>Conflict adding file data. Moved existing file to data.moved.</TT> <TT>Conflict adding file launch.sh. Moved existing file to launch.sh.moved.</TT> <TT>Conflict adding file po. Moved existing file to po.moved.</TT> <TT>Conflict adding file setup.py. Moved existing file to setup.py.moved.</TT> <TT>Conflict adding file spectlib. Moved existing file to spectlib.moved.</TT> <TT>Conflict adding file specto.desktop. Moved existing file to specto.desktop.moved.</TT> <TT>Conflict adding file specto. Moved existing file to specto.moved.</TT> <TT>7 conflicts encountered. </TT> Those files certainly are not new, as you can see them in the svn version. I have some feeling that it is not smart enough to figure out that some files just moved around. stuff like "+N spectlib/trayicon.py" and "<TT>+N data/icons/hicolor/scalable/specto.svg</TT>" troubles me. Were those not already into specto svn? why is it saying it's a new file? omgponies? Also attached, a diff of spectlib and spectlib.moved (it's quite heavy). How do you know bzr did it right (which it certainly didn't in this case)? why does it say +N when that file should have been marked moved/modified/whatever? It is highly suspicious. Any help would be much appreciated as I'm pretty much a bzr (and VCS) newbie and increasingly confused here. So yeah, how do I go about stitching those branches together properly without doing something stupid? Am I even doing it in the right direction? Thanks! </BODY> </HTML>