severity 471560 wishlist thanks On Tue, Mar 18, 2008 at 11:39:21PM +0100, Stefano Zacchiroli wrote: > More generally, also suggestions on how to fix the merge problem > "manually" are totally welcome, I can contribute them back as a snippet > for README.Debian if you want, but first I need to know the actual > solution :-)
OK, here is the "by hand" solution for the problem (thanks to [1] mainly): $ git-symbolic-ref HEAD refs/heads/upstream $ git rm --cached -r . $ git commit --alow-empty -m 'initial upstream branch' $ git checkout -f master $ git merge upstream $ # git-import-orig ../foo.....tar.gz now works! Basically I'm creating a new empty branch called "upstream" without any history, then I'm committing it ensuring that the corresponding tree object is empty. At that point I can merge it easily in master. After that git-import-orig at the next run will happily notice that, wow, the new upstream release finally contain some code :) So I guess this bug report turns into a feature request. Can you please add a -f/--force flag to git-import-orig which does exactly the above in case of missing "upstream" branch instead of failing? Given that git-import-dsc can now be run also on top of pre-existing repositories it would be wonderful to have the same behaviour also in it. TIA, Cheers. [1] http://madduck.net/blog/2007.07.11:creating-a-git-branch-without-ancestry/ -- Stefano Zacchiroli -*- PhD in Computer Science ............... now what? [EMAIL PROTECTED],cs.unibo.it,debian.org} -<%>- http://upsilon.cc/zack/ (15:56:48) Zack: e la demo dema ? /\ All one has to do is hit the (15:57:15) Bac: no, la demo scema \/ right keys at the right time -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
