Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep`

on Friday 07 July 2017 at 22:14, Andy Bradford wrote: > Thus said Natacha Port? on Fri, 07 Jul 2017 09:43:56 -: > > > (3) "fossil checkout --keep", which is advertised as changing the > > "current commit" pointer without touching the working directory, but > > bails out of there are unsaved

Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep`

Thus said Natacha Port? on Fri, 07 Jul 2017 09:43:56 -: > (3) "fossil checkout --keep", which is advertised as changing the > "current commit" pointer without touching the working directory, but > bails out of there are unsaved changes. > (4) "fossil checkout --keep --froce", which changes

Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep`

...   Best Regards K. De : Natacha Porté <nata...@instinctive.eu> À : Fossil SCM user's discussion <fossil-users@lists.fossil-scm.org> Envoyé le : Vendredi 7 juillet 2017 9h44 Objet : Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep` Hello, *

Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep`

Hello, I think the thread got a bit derailed because of my fear the "XY problem", which makes me unable to resist detailing my particular instance of the problem when prompted. So I will give a full transcript of the "problem" below, but I'd like to first clarify the whole point of my posting.

Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep`

On Jul 6, 2017, at 1:30 PM, Natacha Porté wrote: > > on Thursday 06 July 2017 at 14:01, Richard Hipp wrote: >> >> (1) Make edits on Linux but do not commit. >> (2) Copy the files to Windows and verify that they work there too. >> (3) Run "fossil commit" on Linux. >> ...

Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep`

Thus said Natacha Port? on Thu, 06 Jul 2017 19:30:29 -: > Now imagine you leave things as they are after (3) to do some non-dev > stuff (or some dev on other repositories), and you receive a serious > windows-specific bug report. You drop everything to work on it, > forgetting the "fossil

Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep`

Hello, on Thursday 06 July 2017 at 14:01, Richard Hipp wrote: > On 7/6/17, Natacha Porté wrote: > > > > On the other hand, the situation in which I was is the checkout being > > already in the desired state, but fossil having recorded a wrong > > commit as current, so I

Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep`

On 7/6/17, Natacha Porté wrote: > > On the other hand, the situation in which I was is the checkout being > already in the desired state, but fossil having recorded a wrong > commit as current, so I would need a change of current commit while > preserving the whole file

Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep`

Hello, on Thursday 06 July 2017 at 10:59, Richard Hipp wrote: > On 7/6/17, Natacha Porté wrote: > > I was recently in a very uncomfortable situation, with precious > > uncommitted data in the current checkout and the need to change where > > the checkout "current commit"

Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep`

On Jul 6, 2017, at 8:38 AM, Natacha Porté wrote: > > I was recently in a very uncomfortable situation, with precious > uncommitted data in the current checkout and the need to change where > the checkout "current commit" points to. Usually when I find myself in that

Re: [fossil-users] warning about unsaved changes with `fossil checkout --keep`

On 7/6/17, Natacha Porté wrote: > Hello, > > I was recently in a very uncomfortable situation, with precious > uncommitted data in the current checkout and the need to change where > the checkout "current commit" points to. That's what the "fossil update" command is for.