merge scenario and connection to changeset

Hello,

At my repository workspace I have file 1 that was changed and connected to changeset1 (outgoing).
I am accepting changeset2 that also contain file1.

While merging the merged file was included at my workspace also in changeset1 (my changeset).
I do not have any record for my personal change (history, graph) but only for the merged file.

How can I maintain the history of the file prior the merge as well?

I know that I can have a workaround and perform "complete" prior to accept the changeset.
Is there an automatic way to maintain this information?

Yaron