Re: XEmacs Packages have been pre-released (2013-09-02-17)

＠Jerry: You don't need to commit or push to the xemacs-packages repo. Norbert does that as part of the Pre-Release process. And you probably shouldn't, it confuses Norbert, or at least his scripts. :-) hg view on the xemacs-packages repo will give you the picture. Norbert Koch writes: Not really. I was confusing myself. You're just seeing concurrent development happening, this is what *should* happen in that case. Our "packages" workflow is designed to avoid concurrent commits (two commits with the same parent) to make life simple for you. Jerry didn't follow it, that's all. You don't want to use "push -f", that's for sure. It's always possible to pull and merge. The great thing about DAG-based VCSes is that if you avoid commands like 'strip' you can always rewind to any state you've visited before, so pull and (trying to) merge is always safe, in the sense that you can checkout either of the commits you're trying to merge, and work from there by hand to get to somewhere sane. What you lose is time (and maybe some pulled-out hair:-) trying to make the hg-merge commitable. Looking at the state of the "xemacs-packages" repo on bitbucket, it seems to me that all that happened is that Jerry updated the xemacs-packages repo for you. This *would* create a new head that you have to merge. What to do: do 'hg pull' (no '-u') in your xemacs-packages checkout. Then do 'hg view &'. You should see a long list of commits and tags by you, with a tiny fork at the top. There will be one or more commits by you on one branch, and one by Jerry on the other. Do a hg diff between your head and Jerry's. I expect that the only difference will be your additions to .hgtags, and the difference in .hgsubstate. If what you see doesn't make sense to you, feel free to post the diff. If it does make sense, do the hg merge. It may "Just Work". If so, you can commit, and push. If it doesn't, the conflict will be in .hgsubstate at xemacs-base. Choose your line there. Jerry's will have a hash starting with dbe31f6c32..., yours is the other one. Then do "hg resolve --mark .hgsubstate", commit, and push. Before pushing you might want to redo hg view and make sure everything looks sane. _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-beta