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?
A "f addremove" would import the new version but would lose all local
changes.
What I've done so far is to "f diff --unified -r XXXXX" where XXXXX is
the commit of the last upstream version. I can now apply my patches to
the new version before I do an "addremove". Once the "addremove" is
done, I would make further changes if necessary.
In the above scenario, how many and when would one commit? After the
unpack of the latest version? After applying my local patches? After
getting the whole thing to work again? Maybe a combination of the above?
Is there a way to get fossil to carry forward the local changes for me
somehow? Is there a better way than what I've outlined?
With RCS I used to file any local changes into a new branch: for version
X.Y of a package, I would checkin my changes as X.Y.1.0, etc. When there
was a new version X.Z, I could checkin as version X.Z and then do a
"rcsdiff -u -r X.Y -r X.Y.1.n" which I could apply to the new version
X.Z and when all is working again, checkin the new branch X.Z.1.
Maybe there's a way to do the same with fossil (and I did not because I
don't know how).
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
