Re: [Nbd] [PATCH] Add "temporary" option, and ability to create files.

[Wouter Verhelst <w@...112...>]

On Wed, Jun 22, 2011 at 12:07:22AM +0100, Alex Bligh wrote:
> Wouter,
> 
> --On 21 June 2011 18:02:05 +0200 Wouter Verhelst <w@...112...> wrote:
> >It's always possible. However, doing 'git rebase' is painful for anyone
> >who's already pulled from you before the rebase was made public.
> 
> Well, for what ever reason, rebase wouldn't work (it complained
> about a conflict on everything) so I did a "git checkout" of head,
> and reapplied a503252fffcea5b3827c429dff005b9f278b23b4, which is
> the temporary file patch (the only one you haven't taken), and
> did a "git push git.alex.org.uk". This claims we are now in
> sync, though I can still see my old revert commits in the
> repo (but not on my local machine).

I'm not sure, by my guess is that that's because you pushed a single
commit to a branch, which just happened to apply cleanly to that branch
without issues; apparently you didn't push the branch to make it the
same as on your local system. Not what you want.

It probably also means you don't have a --mirror branch on your
git.alex.org.uk server. That's not strictly necessary, but it would
avoid this kind of issue (although it does make it impossible to have
'private' branches that exist only on your local hard disk).

I'd suggest starting over: nuke the git repo on your server and
re-create it ('git init --bare'); then push to it again from your
laptop.

If you want a --mirror version of your repository, do:

git remote add --mirror=push origin <git url for git.alex.org.uk>

then do 'git push origin' to reproduce the exact same git repo you have
on your local hard disk onto the remote system. That's what I do with
git.grep.be.

> On my local machine, a git pull from you says I'm up to date, a rebase
> says there's nothing to do, and a push to my repo says the repo is up
> to date.
> 
> Have I fixed it, or do I need to do more?

See above.

-- 
The volume of a pizza of thickness a and radius z can be described by
the following formula:

pi zz a