943563 - Verbatim is committing surpisingly many merge commits

Status: RESOLVED INCOMPLETE

(Webtools Graveyard :: Verbatim, defect)

Description

[Wil Clouser [:clouserw]]

It looks like moz-verbatim is committing to more than just L10n files.  It's doing merge commits and stuff.  I've seen it once a while ago, this is the most recent example:

https://github.com/mozilla/fireplace/compare/fd52b54334...8afba161cc

It should only be touching .po files

Comment 1

[Axel Hecht [:Pike]]

Can you detail on what's happening? I look at the comparison, and it claims that it changed two files. It'd be helpful to learn what you're expecting.

Please file bugs in the verbatim component, this is not about unknown localizations.

Comment 2

[Wil Clouser [:clouserw]]

I'm not expecting those 8 merge commits to be there.  The sum total is that it changed those two files, but it did it with a bunch of merge commits cluttering up the history.

Comment 3

[Axel Hecht [:Pike]]

Resummarizing.

Dwayne, have concerns like this been raised in other setups, or is that something we're doing?

Here's my speculation: For some reason, we have a merge commit in the local repo, but don't push that. At that point, everytime that a localizer goes in and updates from VCS, we get a merge of that merge.

If that's true, can we avoid having local merge commits around without pushing them upstream?

Comment 4

[Dwayne Bailey]

Axel,

Haven't seen this in any other setup.  We introduced the separate VCS_DIRECTORY in 2.5 so we should have a clean checkout in that directory which should never have any kind of merge conflict.  Since we update that repo then export what we want to commit, then commit.

I guess there is the possibility that between an update and a commit a change could happen upstream in which case we might get a merge commit (this is me as a non-Git expert speaking).

The first step, I think, is to check the repo in VCS_DIRECTORY to see if it is in some odd state.  If it is then I think we can try the next steps which is to clean that up. We might want to change Pootle to prevent that happening again.  If it is OK we'll need to look elsewhere.

Comment 5

[Axel Hecht [:Pike]]

Matjaz, can you check on Dwayne's suggestions?

Comment 6

[Matjaz Horvat [:mathjazz]]

Yes. I checked the fireplace repo and everything looks fine ATM:

[verbatim@verbatim1 fireplace]$ git status
# On branch master
nothing to commit (working directory clean)