From: Gene Czarcinski <gene@czarc.net>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.cz
Subject: Re: [PATCH 00/13] Btrfs-progs: more patches for integration (integration-20130121)
Date: Thu, 24 Jan 2013 16:07:33 -0500 [thread overview]
Message-ID: <5101A295.9090908@czarc.net> (raw)
In-Reply-To: <20130124181308.GT28263@twin.jikos.cz>
On 01/24/2013 01:13 PM, David Sterba wrote:
> On Tue, Jan 22, 2013 at 03:14:35PM -0500, Gene Czarcinski wrote:
>> On 01/21/2013 01:40 PM, David Sterba wrote:
>>> On Sun, Jan 20, 2013 at 04:04:05PM -0500, Gene Czarcinski wrote:
>>>>> I have done some additional scraping of the mailing list to
>>>>> identify some "low hanging fruit" which I consider should
>>>>> be merged into the btrfs-progs repository.
>>> Thanks, I went through them and put together into an integration branch
>>>
>>> git://repo.or.cz/btrfs-progs-unstable/devel.git integration-20130121
>> There is a problem with one of the patches:
>> detect if the disk we are formatting is a ssd
>>
>> The commit comments appear to come from the patch I submitted. However, as I
>> said in the submission, the patch for mkfs.c has to be "refitted" because of
>> a conflict. The conflict is a result of the patch:
>> Fix compiler warnings on PPC64
>> which relocated the include "kerncompat.h" to a different line in the mkfs.c
>> file.
> These merge conflicts are inevitable and normal (though sometimes not
> that trivial). My initial aim was to build one linear branch only with
> fixes and git-merge the patches that add features, but this will not be
> easy to merge for much longer, so I'm going to do a linear integration
> branch so others can take them as checkpoint to base the various
> patchsets.
>
Yes, trying to merge branches with lots of changes are effectively
impossible (impractical?) as far as I am concerned. Unless it is simple
I I understand exactly what is happening, I have found it easier/better
to apply a set of patches one at a time and resolve problems manually.
I just got the subvol show patches applied. I tried putting it into a
separate branch and then doing a merge but I could not trust my results
when I ran mergetool. And, BTW they subvol show patches to apply with
not very many problems. My working branch currently has 44 commits over
91d9eec and subvol show added another ten.
Gene
prev parent reply other threads:[~2013-01-24 21:07 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-20 21:04 [PATCH 00/13] Btrfs-progs: more patches for integration Gene Czarcinski
2013-01-20 21:04 ` [PATCH 01/13] btrfs-progs: btrfs-image.c: Added NULL pointer check Gene Czarcinski
2013-01-21 15:56 ` David Sterba
2013-01-22 17:34 ` Gene Czarcinski
2013-01-23 16:35 ` David Sterba
2013-01-23 18:16 ` Gene Czarcinski
2013-01-20 21:04 ` [PATCH 02/13] Btrfs-progs: fix resolving of loop devices Gene Czarcinski
2013-01-21 16:14 ` David Sterba
2013-01-22 17:50 ` David Sterba
2013-01-20 21:04 ` [PATCH 03/13] Btrfs-progs: correct btrfs receive usage string Gene Czarcinski
2013-01-20 21:04 ` [PATCH 04/13] Btrfs-progs: Fix a segmentation fault in btrfstune when <device> is invalid Gene Czarcinski
2013-01-20 21:04 ` [PATCH 05/13] Add btrfs-show-super Gene Czarcinski
2013-01-21 18:04 ` David Sterba
2013-01-21 19:54 ` Goffredo Baroncelli
2013-01-21 22:22 ` Stefan Behrens
2013-01-22 14:46 ` David Sterba
2013-01-20 21:04 ` [PATCH 06/13] btrfs-show-super.c Gene Czarcinski
2013-01-21 16:46 ` David Sterba
2013-01-22 18:00 ` Gene Czarcinski
2013-01-23 17:38 ` David Sterba
2013-01-22 20:51 ` [PATCH] Fix Makefile for gzip Gene Czarcinski
2013-01-22 20:51 ` [PATCH] fix btrfs-progs build Gene Czarcinski
2013-01-23 17:42 ` David Sterba
2013-01-20 21:04 ` [PATCH 07/13] Btrfs-progs: correcting misnamed parameter options for btrfs send Gene Czarcinski
2013-01-20 21:49 ` Gene Czarcinski
2013-01-20 23:59 ` [PATCH] " Gene Czarcinski
2013-01-20 21:04 ` [PATCH 08/13] Btrfs-progs: bugfix for subvolume parent determination in " Gene Czarcinski
2013-01-20 21:04 ` [PATCH 09/13] Btrfs-progs: fix arg parsing for btrfs qgroup limit commands Gene Czarcinski
2013-01-20 21:04 ` [PATCH 10/13] Btrfs-progs: clean up reduplicate parse_qgroupid() and replace atoi with strtoull Gene Czarcinski
2013-01-20 21:04 ` [PATCH 11/13] Btrfs-progs: check the relation of two group by real level numbers Gene Czarcinski
2013-01-20 21:04 ` [PATCH 12/13] Btrfs-progs: disable qgroupid 0 for quota_tree Gene Czarcinski
2013-01-21 14:11 ` Gene Czarcinski
2013-01-20 21:04 ` [PATCH 13/13] trivial patch for btrfs-progs Gene Czarcinski
2013-01-21 17:40 ` David Sterba
2013-01-22 18:59 ` Gene Czarcinski
2013-01-21 18:40 ` [PATCH 00/13] Btrfs-progs: more patches for integration (integration-20130121) David Sterba
[not found] ` <CAMO4zugaABrbTJB75Yyi_UravfSX81YyqJtmc3yGALrby7+RTQ@mail.gmail.com>
2013-01-22 17:03 ` Fwd: " praneeth u
2013-01-22 18:09 ` Gene Czarcinski
2013-01-22 20:14 ` Gene Czarcinski
2013-01-24 18:13 ` David Sterba
2013-01-24 21:07 ` Gene Czarcinski [this message]
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=5101A295.9090908@czarc.net \
--to=gene@czarc.net \
--cc=dsterba@suse.cz \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.