tag: save manually edited commit message into ".hg/last-message.txt" Before this patch, manually edited commit message for "hg tag -e" isn't saved into ".hg/last-message.txt" until it is saved by "localrepository.savecommitmessage()" in "localrepository.commit()". This may lose such commit message, if unexpected exception is raised. This patch saves manually edited commit message for "hg tag -e" into ".hg/last-message.txt" just after user editing. This patch doesn't save the message specified by -m option (-l is not supported for "hg tag") as same as other commands. This is the simplest implementation to fix on stable. Editing and saving commit message should be centralized into the framework of "localrepository.commit()" with "editor" argument in the future.

     1

  $ hg init

     2

     3

  $ echo a > a

     4

  $ hg ci -qAm 'add a'

     5

     6

  $ echo b > b

     7

  $ hg ci -qAm 'add b'

     8

     9

  $ hg up -qC 0

    10

  $ hg rm a

    11

  $ hg ci -m 'rm a'

    12

  created new head

    13

    14

  $ hg up -qC 1

    15

  $ rm a

    16

    17

Local deleted a file, remote removed

    18

    19

Should fail, since there are deleted files:

    20

    21

  $ hg merge

    22

  abort: uncommitted changes

    23

  (use 'hg status' to list changes)

    24

  [255]

    25

    26

Should succeed with --force:

    27

    28

  $ hg -v merge --force

    29

  resolving manifests

    30

  removing a

    31

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

    32

  (branch merge, don't forget to commit)

    33

    34

Should show 'a' as removed:

    35

    36

  $ hg status

    37

  R a

    38

    39

  $ hg ci -m merge

    40

    41

Should not show 'a':

    42

    43

  $ hg manifest

    44

  b

    45