Hi Bojan! > 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.
That is the cause for the problem. I had merged from your branch and then I did a bzr revert. After this I merged from Stephen. It seems that the revert didn't undo the pending merge. > 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. I looked at the other branches of the contributors. Only Daniel has merged my old 294 revision. So I followed your advice and uncommited the revisions 294 and 295. My local branch seems to work now. However, pushing does no longer work: I get the following error message: bzr: ERROR: These branches have diverged. Try using "merge" and then "push". I will re-upload the current branch. When you are tracking my branch, try, if bzr uncommit works. If not, you will have to redownload it. Stefan. _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
