Re: CI testing with local files

[Michael Reeves]

Thanks.

On Thu, Jan 28, 2021, 2:17 PM Andreas Cord-Landwehr 
wrote:

> On Donnerstag, 28. Januar 2021 10:20:54 CET Konstantin Kharlamov wrote:
> > On Wed, 2021-01-27 at 17:36 -0500, Michael Reeves wrote:
> > > Is there way to reading and writing small files in the CI? I'm in the
> > > process of writing auto tests for kdiff3.
> >
> > Your tests could create a directory inside the current one, and then
> inside
> > the new directory do stuff like creating files, etc. So, unless I
> > misunderstand your question, there's that.
>
> Hi, best practise is to put those files into a QTemporaryDir or create
> them as
> QTemporaryFile to avoid contamination from a previous test run. Also you
> should not change input data during a test that will be needed unchanged
> for
> another test run but prefer copying it to a temporary location.
>
> Best regards,
> Andreas
>
>
>

I need some git advice

[Glen Ditchfield]

I'd like to commit some changes to the akonadi repo, but my grasp of git is 
not firm.  The situation is

 * gabrielsf's commits 404bf743 and 805b31cc to master made most autotests 
work.  I'd like to get them onto the release branch without complicating 
future merges of release to master.

 * I have MR 47 that I would like to merge to release and thence to master.

 * In my local repo's branch I cherry-picked gabrielsf's commits and changed a 
test.  I haven't pushed the test up to my fork of akonadi, but I'd like to get 
the change into release and master.

How should I proceed?