My response didn't arrive in my inbox, did you get it? I can see it in the archives:
http://groups.google.com/group/vim_dev/browse_thread/thread/c2594edc76b2c501/0f851b0548585b44#0f851b0548585b44 I will include it anyway: _sc_, 12.02.2009: > > now my old git has had an opportunity to upgrade my vim to > 7.2.108 i see something in the update.log i don't remember > seeing with svn: > > src/feature.h: needs update I don't see this message when doing a pull with local changes. Maybe due to the newer git version. > apparently git wants to bark at me because i had the > temerity to modify feature.h without sending my changes back > to the repository Come on, git it distributed, in contrast to subversion you have the opportunity to do local commits. No need to have any local changes lying around in your working tree. Just commit them and you are fine. To update you can as always use "git pull" or if you want to see your adjustments on top of the history "git pull --rebase". The --rebase option for git-pull is supported since 1.5.3.6, so you would want to use "git fetch" && "git rebase origin/vim-with-runtime" with your older git. > my question is: what will [my old] git do if/when feature.h > gets modified on the repository end? > > - bark at me with the same warning? Bark with an error and refuse to merge. > - replace my feature.h > - with no warning? > - with a message? Never. > - merge the repository feature.h with my modified one? Currently not. I'm not sure, if this will be supported sometime. >From man git-merge: "you can have local modifications in your working tree as long as they do not overlap with what the merge updates" > i can not only live with getting barked at for having > uncommitted changes, i think it qualifies as a Good Idea -- > but the attention called to this module as caused me to > wonder if his bark is as good as his bite... With local commits this bite is avoidable and you don't have to be afraid to accidentally delete your adjustments. > IIRC svn was mute on the fact that i had modified that file > and replaced it unmerged if it was modified in the svn > repository -- it was pursuant to me to watch his update.log > for 'feature.h' so i could re-apply my changes when it got > replaced svn does not have another possibility, because you cannot avoid having local changes. Merges just have to be possible with local changes there. > sorry to be such a high maintenance git newbie Never mind. It helps me to enhance the README. But I still have to take care of it not becoming a git documentation. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
