[Http-crcsync] Repo not broken after all :-) (Re: I accidentally broke the repo, please help me fix it)

[Martin Langhoff]

On Mon, Apr 27, 2009 at 7:19 PM, Alex Wulms <alex.wulms at scarlet.be> wrote:
> Apparently my browser was fetching an incorrect state from the web-gui of the
> repo and had cached it localy.

I was going to say... the repo looks good. :-)

There is one thing that is amiss, an it is that you commits in two
separate branches (maybe on 2 boxes?), and then merged them, and the
merge _discarded_ the contents of one of them.

So the merge 336d62427796fd19ca14fba423cd39653ef55636 completely
discards 1b2d1c9780c476ef6d65a44d196efc2051e71010 (which is mostly a
documentation commit).

There is something strange in how that merge happened -- maybe you are
saying "git merge -s ours" or something like that?

One way to put that commit back is to do

  git cherry-pick 1b2d1c9780c476ef6d65a44d196efc2051e71010

Your other merge is good --

cheers,




m
-- 
 martin.langhoff at gmail.com
 martin at laptop.org -- School Server Architect
 - ask interesting questions
 - don't get distracted with shiny stuff  - working code first
 - http://wiki.laptop.org/go/User:Martinlanghoff