Comment 0 for bug 385667

Doing merge-upstream in an empty branch does three odd things.

Firstly it tries to add a changelog entry at the end, but it doesn't use --create.

Secondly, you get negative revision numbers for the upstream revisions.

Thirdly, it changes all the file ids.

Perhaps the first two are both ok, or perhaps merge-upstream shouldn't be allowed
in this case, with something else being done instead.

Thanks,

James