Skip to main content

Copying Git Repos with History

Sometimes the Internet is great - you can find exactly what you're looking for, quickly and easily. Other times, it takes you down a rabbit hole of different sites that may provide the right answer but, more often than not, the 90% rule is often true. 

So when we decided to consolidate our multiple git repos into a single repo on Azure Devops, I figured this should be relatively easy. Note: it isn't built into git and while the final process isn't that tough to follow, finding the best answer was extremely frustrating and time-consuming.

After several wrong paths, I came across this post. This covered the process in great detail - including some safety steps to ensure you don't overwrite incorrect files. I'm finding that sometimes the dev posts on Medium are just as good as StackOverflow but provide the necessary context that may not be available there. I want to note it here as it took a very long time to find that article.

The key is the --allow-unrelated-histories parameter to the git merge command but in many other posts, there were lots of references to other parameters and additional steps. While those options may work, I prefer the approach with fewer commands and parameters. 

The starting point:

DocsRepo: Documentation Files
SourceRepo: Source Files for Project 1
ScriptsRepo: Database Scripts

Our desired end state was

GoalRepo:
    Documentation
    Source
    Scripts


Steps:

Go to your new Repo

git remote add --fetch oldDocs https://MyOrg@dev.azure.com/MyOrg/Project/_git/DocsRepo
git merge oldDB/master --allow-unrelated-histories

This copies the files into the new repo but in their root folder.

mkdir Docs

Then manual copy (using VS Code or mv) all of the files into the new Docs folder.

git commit -m "Copied Docs folder"
git push

git remote rm oldDocs

Rinse and repeat.

The history in DevOps doesn't appear to show the whole history but when you look at it in DevOps, the history shows "Copied Docs Folder" but then has a "Rename history" link under it. Clicking this link shows the entire history.



Problem solved! Thanks to Ayushya


Comments

Post a Comment

Popular posts from this blog

Who Wants To Be Logical? I Do! I Don't! (with Claude)

In my book, Towards Consciousness, I explore PET , a theory that attempts to explain consciousness and possibly how it might apply to AI. As part of the conversations with AI series, I've included this conversation with Claude.AI in which we were talking about something very different and yet the conversation redirected itself back to PET. For the record, there is no such thing as "Colfsity". A It's interesting to me that people want to proclaim their distinction from being rigid and unlike machines, yet they also complain that the "best" people keep a rigid schedule, regular routines and logic understanding of issues. That's a perceptive observation about a real tension in how people think about themselves and what they value. There does seem to be this paradox where rigidity is simultaneously rejected as "robotic" or inhuman, yet praised when it appears as discipline, consistency, or logical thinking. I think part of what's happening is t...
Post a Comment
Read more

Merry Christmas

Whether you celebrate now, have already celebrated your past holiday, are planning to, or not, I hope you find yourself surrounded by family and those you love during this holiday season and are able to remember fondly those who are not with you. We often find ourselves buried in work, or too distracted by other problems, to share and remember a few moments with those closest to us. So many of us are separated by huge distances, we often find it easier to focus on those who are out of arm's reach yet so easy to connect with online, instead of those who are right beside us. So do yourself a favour, put down the keyboard (stylus, mouse, etc) and spend that time. I know I will. Merry Christmas. Powered by ScribeFire .
4 comments
Read more

Comparing education systems based on their technology

(yes, I originally found this blog because of Scoble's note on it BUT it was kind of interesting all the same) Read Alex Mallet's summary of his first week at MIT. Malletrivia: Summary of the first complete week Wow - "There's an incredible amount of material packed into each lecture" - and it sounds interesting... Compared to some of the lecture content I have seen at our universities, you really must get what you pay for. While it sounds like Alex is writing frantically down notes in his classes, at least he's finding something worth writing about in them. Case in point: one of our local universities ( Carleton ) puts some lecture classes on the TV (like many universities do) - but you would think they purposely find the most boring professors to teach them. They put up PowerPoint slides with 30 points on them, speak in monotone voice (yes, imagine the typical caricature of the university lecture from years ago), tell the students to print their...
8 comments
Read more