On 6/22/12 2:35 PM, Hanspeter Niederstrasser wrote: > On 6/22/2012 1:59 PM, Alexander Hansen wrote: >> Any thoughts about moving dists/ over to github? >> >> Even though sourceforge isn't going to close down CVS access, it'd be >> nice to move to a more modern system. Plus, for users behind firewalls, >> github allows files to be accessed via https--we're doing pretty much >> the best we can with proxy support for CVS, but sometimes that's still >> blocked. >> >> And for big updates, like a new OS version, I believe it's easier to >> handle a branch to do changes in git than in CVS (I'm not sure about >> that, though). > > My git knowledge is very limited, but the following situation has arisen > several times with the one git repo that I normally play with, and I > could see the same issue arise very frequently if dists/ went to git: > > If I modify a file locally, either as a quick test or because I want to > modify something locally longer term but still get updates automatically > from upstream as they happen, 'cvs up' has no problems updating the > modified file (and keeping my changes) and only complains when my > changes directly conflict with the update. > > In git, however, a single change that is 1000 lines from the pulled > updates stops 'git pull', and then I must either branch, stash, commit, > or undo my changes before continuing. This makes updating the repo more > difficult and much less automatic since I then have to either branch > (and merge branches), or stash/update/unstash changes, etc every time > there's a pull. > > Is there a way to work around what seems to me to be a limitation in > git? Buildworlds and dist-wide package roundups (like unstable->stable > or multi-package dep upgrades) need a lot of overlapping local > modifications and VCS-updating steps, and I stopped trying to do local > fixes in the only non-Fink git repo I look at, because there simple > local fixes kept getting in the way of easily merging upstream changes. > > Hanspeter >
Someone else with more expertise may know more than I do here, but one thing to do would be always to make a local-only branch and do your modifications in the branch. I use the SourceTree GUI, and it offers the handy feature of being able to compare any branch against the current active branch, e.g. a local branch vs. a branch tracking upstream's master. You can then run a diff tool (e.g. FileMerge) on the files with differences so that you can try to integrate your changes into files even if they've been changed upstream in ways that make a merge or cherry-pick not workable. Or, if worst comes to worst, you can at least see upstream's changes as well as your own and manually edit the file. Not that this always saves me from breaking stuff. :-) -- Alexander Hansen, Ph.D. Fink User Liaison My package updates: http://finkakh.wordpress.com/ ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Fink-devel mailing list Fink-devel@lists.sourceforge.net List archive: http://news.gmane.org/gmane.os.apple.fink.devel Subscription management: https://lists.sourceforge.net/lists/listinfo/fink-devel
