Hi Stefan, I think we are working on exactly the same setups so that certainly isn't problem.
Stefan Reichör <[EMAIL PROTECTED]> writes: > But I am not sure, if the bzr merge works as it should. Yes there appears to be a problem with the merge. I think it has to do with your revision 294 -- it has the comment: "Merged from Stephen Leake: Made dvc-partner-buffer permanent local, fixed a bug that not all marked files are used for a DVC operation " but besides Stephen it also marks my branch as merged and then backs out almost all of the changes. If above really is the root of the problem probably would be best if you could un-commit up to revision 293 and then re-merge with me and Stephen. I've merged my branch up to your revision 293 : http://bazaar.launchpad.net/~bojan-bnikolic/dvc/dvc-bzr-ann So that should come in clean. Best, Bojan -- Bojan Nikolic _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
