On 10/23/12 0:20 , Eric J Korpela wrote: > Just an FYI, whatever was done to the repository since the previous git > transition, it could not be pulled over an existing checkout of the GIT > repository
That's normal since the upstream repo became a different one (in terms of its SHA1s) when Rom did the conversion once again. The unofficial (test) repos were supposed to be used for testing only. This is the reason why. > especially if any files were modified. Even after removing the > modified files, git demanded removal of some unmodified files as well and > then still failed. As I said, upstream and your local repo became disjunct. > So I did a clean checkout and I'm spending my > afternoon doing diffs of modified files and merging them by hand. FYI, you could have exported your local commits using git format-patch and applied (git am or git apply) them to a checkout of the current repo for instance. > Whatever it was that caused it, I fervently hope that it never has to > happen again Right, not after the now officially announced migration. That's why it's important to get things done right. Once you made the switch, you have to stick with what you came up with... Cheers, Oliver _______________________________________________ boinc_dev mailing list [email protected] http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
