Mercurial > hg-git
comparison tests/test-convergedmerge.t @ 844:fffe8883960b
git_handler: mark source for rename info as Git or Mercurial
See inline comments for why the additional metadata needs to be stored.
This literally breaks all the hashes because of the additional metadata. The
changing of hashes is unfortunate but necessary to preserve bidirectionality.
While this could be broken up into multiple commits, there was no way to do
that while preserving bidirectionality. Following the principle that every
intermediate commit must result in a correct state, I decided to combine the
commits.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 02 Dec 2014 14:17:09 -0800 |
parents | 9b194d7c9c03 |
children |
comparison
equal
deleted
inserted
replaced
843:da804eac2b00 | 844:fffe8883960b |
---|---|
74 | | 74 | |
75 o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test | 75 o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test |
76 origin | 76 origin |
77 | 77 |
78 $ hg -R hgrepo2 gverify | 78 $ hg -R hgrepo2 gverify |
79 verifying rev eaa21d002113 against git commit efe74cc1e0ede609e3ab5983e61d780a10177ef3 | 79 verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0 |