Skip to content

Erroneous conflict, pootle_fs_git believes FS has changed, when only Pootle has changed. #33

@blake-sc

Description

@blake-sc

Using Pootle 2.8.0rc7 with pootle_fs_git installed using pip from github

When I make changes in Pootle and run pootle fs state it always brings up a message like this:

Conflicts (1)
-------------
Both Pootle Store and file in filesystem have changed

  /en/gnu_style/en.po
   <-->  /gnu_style/po/en.po

I then need to use pootle fs resolve --pootle-wins PROJECT in order to get the changes into the repository. However the repository has most certainly not changed. It is not otherwise seeing the FS as changing, it only sees any change to pootle store as being in conflict with the FS.

This does not occur when using the basic pootle_fs, as expected it only sees the pootle store as having changed, and does not see a conflict, unless the filesystem has actually changed.

I easily reproduced this issue using the examples from pootle/pytest_pootle/data/fs/example_fs/gnu_style

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions