Martin v. Löwis <martin <at> v.loewis.de> writes: > > P.S. I don't believe your claim that it forgot changesets. Could it be > that it simply forgot adding files, and that it did so because you > already had the files in the sandbox, so that the merging failed?
It's more weird actually, it actively forgot some changes in some files but some other changes in the /same/ files did get merged. > P.P.S. Are you sure you have to re-merge when somebody commits > something unrelated to the branch? Or just when somebody else merges > as well? Perhaps only the latter, I'm not sure actually. (but it can also happen that the "unrelated" commit modifies some files you were merging changes in...) _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
