{"thread":{"id":"21146","subject":"Question: Odd merging behaviour with copied/moved files","startedAt":"2009-10-07T08:52:43Z","lastAt":"2009-10-07T08:52:43Z","messageCount":1,"participants":["Michael Harbeck"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"124329","messageId":"loom.20091007T104139-315@post.gmane.org","threadId":"21146","inReplyTo":null,"subject":"Question: Odd merging behaviour with copied/moved files","fromName":"Michael Harbeck","fromEmail":"michael_harbeck@arcor.de","sentAt":"2009-10-07T08:52:43Z","receivedAt":"2009-10-07T08:52:43Z","isPatch":false,"sender":{"key":"michael_harbeck@arcor.de","avatar":null},"body":"Hello,\n\nI'd just had the following situation:\nA repository with a file: File1\n\nA clone of this repository.\nI made some changes to File1 in this repository and checked them in\n\nNow someone decide to to rename and copy the File1 in the first repository and\nchecked those changes in. Now there is no File1 any more in the first repository.\n\nAfter a while I pulled from this first repository. My changes are only merged in\none file! I think this behavior is strange.\n\nIn the second case its also strange, that if there is a copy in the first\nrepository, after a pull my changes in the copied file are also missing.\n\nIs there a possibility to get warned about these situations, or better is there\nan automatic way to merge my changes to both pulled files?\n\nThanks,\n\nMichael\n"}]}