This way, the new upstream is merged into the current branch, keeping possible local changes, instead of checking out an unnamed branch only containing the upstream.
Only tested with Git. --- makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/makefile.in b/makefile.in index 9ed3c5c..e016607 100644 --- a/makefile.in +++ b/makefile.in @@ -162,9 +162,9 @@ update-nopull: fake_target $(HG) checkout; \ fi; \ else \ - $(RC) checkout $$next_version-bootstrap && \ + $(RC) merge $$next_version-bootstrap && \ $(MAKE) bootstrap && \ - $(RC) checkout $$next_version && \ + $(RC) merge $$next_version && \ $(MAKE) bootclean bootstrap update; \ fi