Excerpts from Sascha Silbe's message of Fri Aug 06 11:13:42 +0200 2010: > I'm reading and writing my mails on both my desktop (which has the entire > archive, totalling ~ 16GB) and my laptop (recent mails and partial archive, ~ > 1-2GB). > Up to now I used sup-dump and sup-sync --restored to synchronize the two > (every time I switched between them, since it's a full dump as opposed to a > log file or diff). > After merging the latest changes (including a full dump + restore for index > upgrade, taking about 33 hours), the --restored option to sup-sync is gone > (and without it sup-sync doesn't do anything useful). How do I go about > "merging" the changes done on the other system now?
Any suggestion? This is preventing me from updating to git master and rebasing my outstanding patches. Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/
signature.asc
Description: PGP signature
_______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel
