On 2013-11-20 13:29, Johannes Sixt wrote:
[...]
> UU ppcadm/modules/quarantine.py
>
> That's strange. I can't tell what is going on. Perhaps you have some
> criss-cross merges in your history that merge-recursive trips over?
>
> Sorry, I don't know how to help you further.
Hah! I worked it out!
W dniu 2013-11-20 13:03, Matthew Cengia pisze:
On 2013-11-20 08:20, Johannes Sixt wrote:
[...]
Not really. It's impossible to tell what's wrong if you
Hi Hannes,
Thanks for your response, and sorry for providing insufficient
information; this is a company Git repo (it's also about 200MB), so
On 2013-11-20 13:29, Johannes Sixt wrote:
[...]
> That's strange. I can't tell what is going on. Perhaps you have some
> criss-cross merges in your history that merge-recursive trips over?
That's as good a guess as any, but I suspect tracking it down may
involve needles and haystacks...
>
> Sorr
Am 11/20/2013 13:03, schrieb Matthew Cengia:
> The only changes I expect are these:
>
> mattcen@sonar:prisonpc(wtf)$ git --no-pager diff --numstat --oneline
> \ "$(git merge-base wtf origin/22869-new-kernel)"
> origin/22869-new-kernel 37 0 client/kernel/README 2797
> 0 client/kern
On 2013-11-20 08:20, Johannes Sixt wrote:
[...]
> Not really. It's impossible to tell what's wrong if you
Hi Hannes,
Thanks for your response, and sorry for providing insufficient
information; this is a company Git repo (it's also about 200MB), so I've
got be careful what I post, but I can certai
Am 11/20/2013 4:49, schrieb Matthew Cengia:
> The other day I was merging a feature branch (shown below as
> origin/22869-new-kernel) into my staging release (shown below as 'wtf'),
> and it *reverted* a bucket-load of changes I'd made on other branches
> which had been merged into staging before.
6 matches
Mail list logo
