4 ms·
I would suggest using git-svn rather than versioning your local changes with diffs, but I guess that's just personal preference. {edit} Just to add that: > I
by pyre 17y ago
I would suggest using git-svn rather than versioning your local changes with diffs, but I guess that's just personal preference.
{edit}
Just to add that:
> I'll tell you what happens when I use svn and there's been an upstream change: I never update my local tree with local modifications. Instead, I extract all my local changes into a diff, then I update my local tree, and then I merge my diff back into the updated tree and commit.
git has this built-in with 'git stash' which cleans up the index and working directory (leaving ignored or untracked files alone) and stashes the changes in a 'stacked' list. You can then use operations like 'git stash pop' or 'git stash list' to operate on that list.
- barrkel 17y agoSure, if I wanted to solve a problem I didn't have. I found this answer enlightening: http://stackoverflow.com/questions/747075/how-to-git-svn-clone-the-last-n-revisions-from-a-subversion-repository/2348596#2348596 http://stackoverflow.com/questions/747075/how-to-git-svn-clo... git-svn doesn't look like it deals terribly well when it only has a shallow copy of the repository. I may be entirely wrong of course, but I'd hate to have to pull down 100+GB of data over VPN onto my 80G SSD just to keep git happy. (Yes, there are binaries in there, rather too much of them for me to update every day.)
- pyre 17y agoIt was just a suggestion (I use git-svn at work for our svn repositories). But none of our repos are 100+GB, so it wouldn't work in your use-case. Though I shudder to think of what maintaining a SVN repo of that size must be like (from the back-end of trying to keep it running and performant).