Thomas Berg wrote: > > git-p4 only uses the branch mapping for the initial commit on a > branch. It does not attempt to detect merges after that point. After > importing to git, merges just appear as regular commits in the > history. > Thank you for the info, that's the way it seems to be working! It's a shame if the cloning from perforce -> git can't be made succesfully keeping all the history information :( Thomas Berg wrote: > > There was another script called git-p4raw for importing Perforce > history to git, which does merge detection. It solved the problem by > having configurable rules for what should be regarded as a merge, and > it supported manually reviewing the decisions afterwards (iirc). > Yes, I tried the git-p4raw too. Actually even several forks of it! But I wasn't able to get any of those working, as none of them could load the perforce database correctly. Maybe the perforce database has changed lately or something, as git-p4raw gave errors that it's database tables don't have as much columns as perforce's does. Tried also to change the code to add those columns but there were so many of them and in many tables so I decided it's too hard and time-consuming to start reverse-engineering them.. - tumik -- View this message in context: http://git.661346.n2.nabble.com/git-p4-Trouble-importing-all-perforce-branches-into-git-repository-tp6383422p6482333.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html