Stitch two 'unrelated' repositories together
Wagner Bruna
wagner.bruna+mercurial at gmail.com
Thu Jun 18 13:25:39 CDT 2009
KrisVH wrote:
> I think one of the problems is that it detects files that should be
> identical as completely different. While I was messing around, I
> tried the following:
> * Update to the last revision of repo A
> * Delete everything, and copy everything from the first revision of B
> to the working directory
> * Commit
> In theory, most files should be unchanged, and when I checked that
> with DiffMerge, it says they're identical. The commit however, thinks
> all files are completely different, and asks to resolve conflicts on
> all of them. Why would it do this? Could there be something in the
> file encoding that is different?
Line endings, perhaps?
--
Wagner
More information about the Mercurial
mailing list