![]() ![]() This would delete files from my personal branch which were deleted on trunk, add any new files created on trunk, and replace any common files with the versions in trunk. What I'd like to do now is say "merge from trunk to branch", select to merge from head of trunk to head of my branch, and say "replace everything". They're not a problem right now, but the work I needed them for has come and gone.Īs time goes on and other people submit changes to trunk, my personal branch diverges further from trunk, until I decide I need to get my personal branch back to head of trunk. I don't want these hacks to go back into trunk, nor do I necessarily still want them in my branch. ![]() I've checked them in, because we all need access to these bodges while we're looking at what we're fixing. The plain-vanilla textbook way of using branches, in other words.ĭuring my hacking, my personal branch inevitably acquires a few bodges, workarounds and test point printf's for things I've done along the way. I have a personal branch, branched from the code trunk at some earlier revision, in which I do my own work before submitting to trunk. We have a code trunk, into which all the latest development goes. If (c), note that "Because SVN can't do it" is not a good reason. Anyway, I'll try again and hopefully someone can either (a) explain how to do it, (b) second me in requesting a bugfix, or (c) give me a good reason why I wouldn't want to work this way. ![]() I wasn't very complimentary about SVN over there, which might be why - I can only say that I was having a bad day, and SVN woes weren't helping. This is a question I posted on and didn't get a reply to. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |