Re: [fossil-users] What is the best way to update to a new upstream version

2017-06-13 Thread The Tick
On 6/13/2017 3:05 PM, Joerg Sonnenberger wrote: On Tue, Jun 13, 2017 at 02:44:31PM -0500, The Tick wrote: Thanks, that is what I was looking for. I've set up a test respository and things look good until I get to the final "merge" step: $ f init F.fossil $ f open F.fossil $ f add project $ f

Re: [fossil-users] What is the best way to update to a new upstream version

2017-06-13 Thread Joerg Sonnenberger
On Tue, Jun 13, 2017 at 02:44:31PM -0500, The Tick wrote: > Thanks, that is what I was looking for. I've set up a test respository and > things look good until I get to the final "merge" step: > > $ f init F.fossil > $ f open F.fossil > $ f add project > $ f commit --tag 1.5 --branch Official > $

Re: [fossil-users] What is the best way to update to a new upstream version

2017-06-13 Thread The Tick
On 6/13/2017 12:52 PM, Joerg Sonnenberger wrote: 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

Re: [fossil-users] What is the best way to update to a new upstream version

2017-06-13 Thread Joerg Sonnenberger
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