linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hullen@t-online.de (Helmut Hullen)
To: linux-btrfs@vger.kernel.org
Subject: Re: New btrfs-progs integration branch
Date: 06 Jun 2012 17:52:00 +0200	[thread overview]
Message-ID: <CAMmdFRuCXB@helmut.hullen.de> (raw)
In-Reply-To: <20120606154032.GO15986@carfax.org.uk>

Hallo, Hugo,

Du meintest am 06.06.12:

>>> However, the third line with the problem looks like something out
>>> of date. Possibly a mis-merge?
>>
>> Where should I search?

>    Well, the first thing would be to try a completely new clone of
> the repo, then git co integration-20120605, and run make again.

I had a brand new git clone.

Produced with

[...]
git clone http://git.darksatanic.net/repo/btrfs-progs-unstable.git
cd btrfs-progs-unstable
git checkout integration-20120605

(and "btrfs-progs-unstable" had been empty before "checkout")

> If
> that's OK, then take a look with gitk in the broken repo and see what
> kind of history you've got in there -- it should be a single unbroken
> sequence from "master" (1957076ab4fefa47b6efed3da541bc974c83eed7) to
> "integration-20120605" (d4c539067d1cb2476c7fb6003625de26e84059af).

I don't know much about working with git ... but I suppose I'm not  
working with such things as a (broken) repo.

It's the same way I had successfully compiled your version from 20111012  
and from 20111030.

Is there any change compiling the new version?

Viele Gruesse!
Helmut

  reply	other threads:[~2012-06-06 15:55 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-05 19:09 New btrfs-progs integration branch Hugo Mills
2012-06-06 11:48 ` Helmut Hullen
2012-06-06 13:14   ` Hugo Mills
2012-06-06 15:03     ` Helmut Hullen
2012-06-06 15:40       ` Hugo Mills
2012-06-06 15:52         ` Helmut Hullen [this message]
2012-06-06 16:04           ` Hugo Mills
2012-06-06 16:18             ` Helmut Hullen
2012-06-06 16:26               ` Hugo Mills
2012-06-06 19:13     ` Helmut Hullen
2012-06-07  1:08 ` Jérôme Poulin
2012-06-26  8:58 ` Alex Lyakas
2012-06-26  9:58   ` Hugo Mills
2012-06-26 18:43     ` Alex Lyakas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAMmdFRuCXB@helmut.hullen.de \
    --to=hullen@t-online.de \
    --cc=helmut@hullen.de \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).