How to merge relocated files
Ulf Zibis
Ulf.Zibis at CoSoCo.de
Sun Jun 29 21:59:38 UTC 2014
Hi all,
this is my first post here, please excuse beginner mistakes.
I have:
src/path/file in branch A
test/path/file in branch B
I tried (with help of NetBeans IDE, so the real commands may be little different):
hg branch A
hg rename src/path/file test/path/file
hg merge B
With "hg status -C" I discovered, that the source information from the before rename was lost after
the merge :-(
Even a later "hg copy -A src/path/file test/path/file" was rejected by error message.
What can I do to track test/path/file as sucessor of src/path/file in one commit after the merge?
Regards,
Ulf
*** Please CC me, as I'm not subscribed to the list.
More information about the Mercurial
mailing list