This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Making your branches smaller for easier merges
- From: Paul Brook <paul at codesourcery dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: "Daniel Berlin" <dberlin at dberlin dot org>, gcc at gcc dot gnu dot org
- Date: Wed, 27 Sep 2006 22:03:47 +0100
- Subject: Re: Making your branches smaller for easier merges
- References: <4aca3dc20609271337o77f07fdalf85679754e7a80d1@mail.gmail.com>
On Wednesday 27 September 2006 21:37, Daniel Berlin wrote:
> I see occasional complaints about the size of mainline merges to
> branches Most people working on branches are only modifying a very
> small subset of the files that are in mainline, and certainly not the
> entire trunk tree.
I'm kinda surprised this is still a problem.
With svn even big merges should be fairly quick, and if you're only modifying
a small part of the tree then everything else should merge without conflicts.
Am I missing something?
Paul