i using "git-p4" script migration p4 git. clone operation failing due large number of change list (about 5 million). trying perform incremental import operation: tried clone first run sync operation. tested small changes list.
first run:
git p4 clone //depot/f1/f2/f3/ere@17888479,17918050 -v second run:
git p4 sync //depot/f1/f2/f3/ere@17918051,17918064 -v error:
traceback (most recent call last): file "c:\program files\git\mingw64/libexec/git-core\git-p4", line 3677, in <module> main() file "c:\program files\git\mingw64/libexec/git-core\git-p4", line 3671, in main if not cmd.run(args): file "c:\program files\git\mingw64/libexec/git-core\git-p4", line 3429, in run die("fast-import failed: %s" % self.giterror.read()) file "c:\program files\git\mingw64/libexec/git-core\git-p4", line 122, in die raise exception(msg) exception: fast-import failed: warning: not updating refs/remotes/p4/master (new tip 85c94d84335bb1441a7f959b384729b2a4d633f4 not contain 3222bdc29799d1fe5fff91c36524481b1469f1d9)
workaround: - create directory , clone codes change list ranges. git p4 clone //depot/f1/f2/f3/ere@17888479,17918050 -v - push codes git repository. can use given script on below link move code history. https://gist.github.com/emiller/6769886 - create directory (empty repository) , clone codes incremental change list ranges. - pull codes git , merge codes in local repository. - resolve conflict , push after commit
Comments
Post a Comment