Need help for a hg push

Norbert Koch viteno at xemacs.org
Tue Jan 10 09:53:02 EST 2012


* "Stephen J. Turnbull" <stephen at xemacs.org>:

> That's correct.  It is not obvious to me that recursive commit is
> desirable unless Norbert *never* makes local changes of his own in
> packages in that tree[2], only changes related to releases and build
> infrastructure.  The point is that he needs to pull in the package
> repo anyway, and he needs to do the ChangeLog and Makefile updates
> there, so he may as well commit there too.  Then back up to the top
> level, make any needed changes there, commit, and push.

Hmm, how should I commit the Makefile and ChangeLog changes I make to
the packages?  Right now after I've uploaded the new set I get

nk at vserv:test% hg st -qS
M xemacs-packages/Sun/.hgtags
M xemacs-packages/Sun/ChangeLog
M xemacs-packages/Sun/Makefile
M xemacs-packages/cc-mode/.hgtags
M xemacs-packages/cc-mode/ChangeLog
M xemacs-packages/cc-mode/Makefile
M xemacs-packages/ede/.hgtags
M xemacs-packages/ede/ChangeLog
M xemacs-packages/ede/Makefile
M xemacs-packages/edit-utils/.hgtags
M xemacs-packages/edit-utils/ChangeLog
M xemacs-packages/edit-utils/Makefile
M xemacs-packages/eudc/.hgtags
M xemacs-packages/eudc/ChangeLog
M xemacs-packages/eudc/Makefile
M xemacs-packages/mmm-mode/.hgtags
M xemacs-packages/mmm-mode/ChangeLog
M xemacs-packages/mmm-mode/Makefile
M xemacs-packages/net-utils/.hgtags
M xemacs-packages/net-utils/ChangeLog
M xemacs-packages/net-utils/Makefile
M xemacs-packages/speedbar/.hgtags
M xemacs-packages/speedbar/ChangeLog
M xemacs-packages/speedbar/Makefile
M xemacs-packages/text-modes/.hgtags
M xemacs-packages/text-modes/ChangeLog
M xemacs-packages/text-modes/Makefile
M xemacs-packages/w3/.hgtags
M xemacs-packages/w3/ChangeLog
M xemacs-packages/w3/Makefile
M xemacs-packages/w3/lisp/custom-load.el
M xemacs-packages/xemacs-base/.hgtags
M xemacs-packages/xemacs-base/ChangeLog
M xemacs-packages/xemacs-base/Makefile


because these changes have been committed locally.

I can revert them and commit/push from the top level.  Would this then
be correct?  Or do I have to push the changes individually (but what'll
happen to my top level repo then)?

Heck, I'll never understand it :-)

Thanks,
norbert.
-- 



More information about the XEmacs-Beta mailing list