[Ns-developers] patch upgrades for releases?
mazo at iitp.ru
Fri Jan 8 10:19:16 PST 2010
On Fri, 08 Jan 2010 18:32:28 +0300, Tom Henderson <tomh at tomh.org> wrote:
> It seems that we can really only reduce the fear or hassle factor (for
> instance, a script that performs a dry run of an upgrade in a temporary
> directory and prompts the user "everything looks OK, do you want to
> proceed?") but if there are private modifications that conflict, it
> wouldn't help fix those. At the very least, the user might learn of
> where the hot spots are in his or her code that prevent a clean upgrade,
> or might look at the patch more carefully to see if items are of interest.
It seems that you are trying to write your own update.py, which is no more than just "hg clone http://code.nsnam.org/ns-3-dev ns-3-dev-merging && cd ns-3-dev-merging && hg pull ../ns-3-my-private-repo && hg merge && hg ci || echo Something went wrong".
I think, if a user has made rather complex changes to the source code, he uses mercurial to store these changes, thus "hg merge" is just enough.
Also, there are usually several major differences between releases, which often requires manual merging with careful reading of CHANGES.html.
So I don't like the idea of distributing patches and not even understand the idea of any special update.py.
More information about the Ns-developers