#1949: provide floating branch to "current release" and links to it --------------------------+------------------------------------------------- Reporter: rhaas | Owner: Type: enhancement | Status: new Priority: minor | Milestone: Component: Other | Version: development version Resolution: | Keywords: EinsteinToolkit --------------------------+-------------------------------------------------
Comment (by rhaas):
I think the update strategy would then be:
{{{ bin/GetComponents -u --root . .crl_components # update manifest bin/GetComponents -u --root . manifest/einsteintoolkit.th # update everything else }}}
which should work with the current setup. I would actually argue to remove the complex logic about preserving changes and doing git stash etc in the git code of GetComponents and use a simpler strategy: "if the workspace is clean and git pull --ff-only succeeds use this otherwise use the result of git fetch only and inform the user that repo XXX could not be updated due to local changes".