[fossil-users] Question about MERGE

Today I tried something and got an unexpected result. So, I would like to know what the right way would have been. I created a new branch and made a whole bunch of changes. Some of these changes were tested, and so I decided to merge them in to the trunk. I did this by going to trunk, and

Re: [fossil-users] Question about MERGE

OK, but doesn't cherry-pick work the same as a MERGE but only for single version of the timeline? My intent was to get all changes from the branch (the whole history) but for specific files, only. -Original Message- From: Richard Hipp Sent: Wednesday, October 28, 2015 6:00 PM To:

Re: [fossil-users] Question about MERGE

On 10/28/15, to...@acm.org wrote: > Today I tried something and got an unexpected result. So, I would like to > know what the right way would have been. > > I created a new branch and made a whole bunch of changes. Some of these > changes were tested, and so I decided to merge

Re: [fossil-users] Question about MERGE

On 10/28/15, Richard Hipp wrote: > On 10/28/15, to...@acm.org wrote: >> OK, but doesn't cherry-pick work the same as a MERGE but only for single >> version of the timeline? >> >> My intent was to get all changes from the branch (the whole history) but >> for >> >

Re: [fossil-users] Question about MERGE

On 10/28/15, to...@acm.org wrote: > OK, but doesn't cherry-pick work the same as a MERGE but only for single > version of the timeline? > > My intent was to get all changes from the branch (the whole history) but for > Fossil does not currently support the ability to merge some

Re: [fossil-users] SHA1 and security

On Wed, Oct 28, 2015 at 6:37 PM, Eduard wrote: > Hi, > > I wish to discuss the issues surrounding the use of SHA1 in Fossil and > their consequences, as well as propose several possibilities to deal > with them. > {whole bunch of snipped stuff} If fossil didn't

Re: [fossil-users] Question about MERGE

This is a surprisingly frequent need. Fossil is designed around a "get things right the first time" philosophy but real life is often not that crisp and clean. Being able to gracefully recover from mistakes and then get rid of the irrelevant leftover cruft would be a wonderful addition to fossil.

[fossil-users] SHA1 and security

Hi, I wish to discuss the issues surrounding the use of SHA1 in Fossil and their consequences, as well as propose several possibilities to deal with them. I would like to take a moment to define collision resistance and second-preimage resistance. A hash H is collision-resistant if it is