Makefile: do update on a temporary copy of a po file
This avoids having a half completed file (with a new timestamp) when msgmerge
has failed.
i18n-pt_BR: synchronized with
d24ee6d7d167
date: allow %z in format (
issue4040)
merge: move forgets to the beginning of the action list
Forgets need to be in the beginning of the action list, same as removes. This
lets us avoid clashes in the dirstate where a directory is forgotten and a
file with the same name is added, or vice versa.
rebase: fix working copy location after a --collapse (
issue4080)
Rebasing with --collapse would leave the working copy on the parent of the
collapsed commit, instead of on the collapsed commit. This fixes that. Also
fixes a few tests that already covered this area but had bad data.
This also fixes
issue3716 where bookmarks are not kept across rebases with
--collapse. I updated the test to cover that case as well.