22.06.2011 22:15, Erich Titl пишет: > HI Andrew > > on 21.06.2011 23:38, Andrew wrote: >> 22.06.2011 00:16, Erich Titl пишет: >>> Andrew >>> >>> on 21.06.2011 21:25, Andrew wrote: >>>> 21.06.2011 21:43, Andrew пишет: >>>>> 21.06.2011 21:29, KP Kirchdoerfer пишет: >>>>>> Ok; created the repository leaf/bering-uclibc. >>>>>> git clone ssh://u...@leaf.git.sourceforge.net/gitroot/leaf/bering-uclibc >>>>>> >>>>>> It's currently empty. Maybe someone will git knowledge will move the >>>>>> content >>>>>> of leaf/leaf/buildtool to leaf/bering-uclibc/bering-uclibc4? >>>>>> I believe a date for this should be given, so everyone can clean >>>>>> up/save/whatelse his local repositories just to be safe. >>>>>> >>>>>> kp >>>>> I'll try to do it now. It shouldn't be too hard :) >>>>> >>>> Done. To move on new repository with minimal wasting of time, just do >>>> next commands: >>> You don't want to be in the directory of your old git repository or do you? >>> >> This is for fast switching your working git directory(local repository) >> from leaf/leaf to leaf/BuC, without downloading of ~350M files and >> possible without recompiling all. >>>> git remote add BuC >>>> ssh://nitr0...@leaf.git.sourceforge.net/gitroot/leaf/bering-uclibc >>>> git config branch.master.remote BuC >>>> git config branch.master.merge refs/heads/master >>>> git pull > Well, well, well ..... > > git pull > et...@leaf.git.sourceforge.net's password: > error: Entry 'buildtool/COPYING' not uptodate. Cannot merge. > fatal: merging of trees e706444b7869ff20f2b976ed830388f288581773 and > 5ee7f8db6b0ed48d0e927c20dcd3028b1719359a failed > Merge with strategy recursive failed. > > needless to say, I never touched COPYING > > Although GIT might be a great tool, either we cannot use it or there is > something completely wrong. > > Could someone set this somehow right. This is just a great waste of energy > > cheers > > Erich Do 'git reset --hard' to sync all files to repo, then try again. On what commit you are now (top in 'git log')?
------------------------------------------------------------------------------ Simplify data backup and recovery for your virtual environment with vRanger. Installation's a snap, and flexible recovery options mean your data is safe, secure and there when you need it. Data protection magic? Nope - It's vRanger. Get your free trial download today. http://p.sf.net/sfu/quest-sfdev2dev _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
