MFC r339990

[0mp]

Summary

Does it look correct?

I've used svn merge -c 339990 ^/head stable/12.

[bcr]

It does look right. Just make sure that you commit the directory, not the file itself directly. Otherwise, you'll lose the mergeinfo.

At the bottom of the commit message window, you should have:

_M 12
M stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8

Also, remove the "MFC after" line (since this is what you are doing with this commit) and add at the very top of the commit message: MFC r<revisionnumber>:

[0mp]

In D23976#527050, @bcr wrote:

It does look right. Just make sure that you commit the directory, not the file itself directly. Otherwise, you'll lose the mergeinfo.

At the bottom of the commit message window, you should have:

_M 12
M stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8

Also, remove the "MFC after" line (since this is what you are doing with this commit) and add at the very top of the commit message: MFC r<revisionnumber>:

Done! See the output of svn log -c 358917.