Mercurial > public > mercurial-scm > hg
diff tests/test-convert-git.t @ 25905:80149d0b6842
convert: fix git convert using servers branches
The conversion from git to hg was reading the remote branch list directly from
the origin server. If the origin's branch had moved forward since the last git
fetch, it would return a git hash which didn't exist locally, and therefore the
branch was not converted.
This changes it to rely on the local repo's refs/remotes list of branches
instead, so it's completely cut off from the server.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Wed, 29 Jul 2015 13:21:03 -0700 |
| parents | d9133e89d39d |
| children | a7527c5769bb |
line wrap: on
line diff
--- a/tests/test-convert-git.t Sat Jan 24 22:28:14 2015 +0900 +++ b/tests/test-convert-git.t Wed Jul 29 13:21:03 2015 -0700 @@ -666,6 +666,28 @@ master 0:03bf38caa4c6 origin/master 0:03bf38caa4c6 +Run convert when the remote branches have changed +(there was an old bug where the local convert read branches from the server) + + $ cd git-repo7 + $ echo a >> a + $ git commit -am "move master forward" + [master 0c81947] move master forward + Author: nottest <test@example.org> + 1 file changed, 1 insertion(+) + $ cd .. + $ rm -rf hg-repo7 + $ hg convert --config convert.git.remoteprefix=origin git-repo7-client hg-repo7 + initializing destination hg-repo7 repository + scanning source... + sorting... + converting... + 0 commit a + updating bookmarks + $ hg -R hg-repo7 bookmarks + master 0:03bf38caa4c6 + origin/master 0:03bf38caa4c6 + damaged git repository tests: In case the hard-coded hashes change, the following commands can be used to list the hashes and their corresponding types in the repository: