On Tue, Jun 13, 2017 at 12:17:46PM -0500, The Tick wrote: > Given a repository based on a previously fetched version of some software > package and having been modified with local changes, what is the best way to > update to a more recent version of the upstream package?
The best approach is still to kind of emulate what CVS is doing with vendor branches. It works best if you start from scratch, but with some work it can be fixed up later: - Create a branch off the initial empty commit for this package. - Put the sources into the correct subdirectory, addremove. - Commit, possibly with a tag including the package name and version. - Now merge that branch into trunk. - Commit local changes on top. If you want to update: - Checkout the branch. - Remove all files, put the sources into the correct subdirectory, addremove. - Commit. - Merge the branch into trunk. - Fix any conflicts. Joerg _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
