Question

I had 2 Python similar scripts, that I’ve since merged into one (and now takes some parameters to differ the behaviour appropriately). Both of the previous files are in the tip of my Mercurial repository. How can I indicate that the new file, is a combination of the 2 older files that I intend to remove?

Also note, that 1 file has been chosen in favor of the other, and some code moved across, so if it’s not possible to create a version controlled file with a new name, then assimilating one file’s history into the other will suffice.

Answer 1

It’s not a perfect solution, and it might be too late to do it this time, but I think hg rename would get you where you want to go. Here’s a sequence:

ry4an@hail [~/hg] % mkdir test
ry4an@hail [~/hg] % cd test/
ry4an@hail [~/hg/test] % hg init
ry4an@hail [~/hg/test] % echo stuff > file1
ry4an@hail [~/hg/test] % echo different > file2
ry4an@hail [~/hg/test] % hg commit --addremove -m 'adding both separately'
adding file1
adding file2
ry4an@hail [~/hg/test] % hg rename --force file1 file2
ry4an@hail [~/hg/test] % hg commit -m 'overwrote 2 with 1'
ry4an@hail [~/hg/test] % hg grep --follow different file2
file2:0:different
ry4an@hail [~/hg/test] % hg grep --follow stuff file2 
file2:1:stuff

Notice that the file ‘grep’ find that ‘stuff’ was in file2 revision 1 and ‘different’ was in file two revision 0, so both histories are now in file2.