Error: "we do not allow replacements to modify files"

[André Reinald]

Hi, Can anyone tell me what's wrong with the following please? Thanks, A

hg commands:

$ hg commit
$ hg pull
$ hg merge central
$ hg commit
$ hg push review
pushing to ssh://reviewboard-hg.mozilla.org/autoreview
searching for appropriate review repository
redirecting push to ssh://reviewboard-hg.mozilla.org/gecko
(adding commit id to 2 changesets)
transaction abort!
rollback completed
abandon : we do not allow replacements to modify files

Here is my hg log:

changeset:   294832:a6f46ea13282
tag:         tip
parent:      294831:00d961ce3c26
parent:      294830:cfc7ebe59293
user:        André Reinald <arei...@mozilla.com>
date:        Tue Apr 26 12:26:06 2016 +0200
summary:     Merged to m-c.

changeset:   294831:00d961ce3c26
parent:      293746:79a13963c376
user:        André Reinald <arei...@mozilla.com>
date:        Tue Apr 26 12:23:26 2016 +0200
summary:     Bug 1191324 - Extend Marionette to allow automation of telemetry tests; r?maja_zf

changeset:   294830:cfc7ebe59293
fxtree:      central
parent:      294753:79de998e7307
parent:      294829:749d5c64699e
user:        Wes Kocher <wko...@mozilla.com>
date:        Mon Apr 25 17:11:09 2016 -0700
summary:     Merge inbound to central, a=merge

...

[Steven MacLeod]

It's almost certainly a bug that you're hitting this error, can you please file a bug under "MozReview :: Integration: Mercurial" with the details.

--
You received this message because you are subscribed to the Google Groups "mozilla-code-review" group.
To unsubscribe from this group and stop receiving emails from it, send an email to mozilla-code-re...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[Steven MacLeod]

Hmm, taking a look at your commands it appears you're attempting to push a merge commit for review - which is unsupported and should throw an error message. I'm thinking we have a bug which is causing us to print the wrong error message in this case.

You'll want to rebase your code when attempting to push for review, rather than merging.

[arei...@mozilla.com]

Thanks Steven, I'll try that and keep you updated.

[André Reinald]

On 16-04-26 22:21, Steven MacLeod wrote:
> You'll want to rebase your code when attempting to push for review,
> rather than merging.

Though I messed up my repo along the way, it ended up working.
Next time I'll know: no merge!
Thanks!