Yes, it was a merge and some of the files were altered during the merge (resolve conflicts, fix some layout issues before commiting).
bzr revno: 1364
When you say "multiple parents in the commit" do you mean a merge? Because something special in this repo is that it is has been merged with an earlier unrelated, separate repository with full history. Which cannot be repeated properly because of another bug (bug 364305).
Yes, it was a merge and some of the files were altered during the merge (resolve conflicts, fix some layout issues before commiting).
bzr revno: 1364
When you say "multiple parents in the commit" do you mean a merge? Because something special in this repo is that it is has been merged with an earlier unrelated, separate repository with full history. Which cannot be repeated properly because of another bug (bug 364305).