-
Committer:
Tarmac
-
Author(s):
John Arbash Meinel
-
Date:
2014-04-12 06:15:19 UTC
-
mfrom:
(2271.1.1 1.18-filetesting-ids)
-
Revision ID:
tarmac-20140412061519-s9tahl0hitwpbfx9
[r=jameinel] testing/filetesting: preserve bzr file-ids
filetesting was backported from trunk to 1.18 using diff+patch rather than a bzr merge that would preserve its file identifiers. That means that when merging from 1.18 => trunk all those files look like duplicated files. This patch just fixes up the Bazaar indentifiers so that they match, which should allow easier merging between 1.18 and trunk in the future.
As this is a metadata only change (no code changes), I'm going to self approve this.