Mike Kupfer writes:
After you updated the ChangeLog and Makefile in ruby-modes, where
did
you do the commit? I'm guessing you did it in ruby-modes, but not the
top level.
I agree. (I thought that the need for a top-level commit was obvious,
but I guess I'm just turning Dutch in my old age.[1])
> Should I push the local changes in the subrepo (e.g. ruby-modes
like I
> just did) or should I push all my changes from the top-level?
IIUC, if you push from ruby-modes, you'll only push the changes in the
ruby-modes tree; the top-level ChangeLog change will not get pushed.
But if you do the commit and push from the top level, Mercurial will
take care of both repos (top-level and ruby-modes) for you.
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.
If doing an explicit commit in the package makes sense to you,
Norbert, you can suppress recursive commits (that would pick up any
random changes in other packages) with "ui.commitsubrepos=no" in a
configuration file (probably best is the toplevel .hg/hgrc).
Besides avoiding unintended commits and pushes of random cruft in the
tree, the other reason for committing in the package would be if you
want different log messages.
Footnotes:
[1] `python -m this`
[2] Of course he can do anything he pleases in a different workspace,
and submit it like any developer and have no impact on release process.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta