This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

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: "Manuel LÃpez-IbÃÃez" <lopezibanez at gmail dot com>, "Daniel Berlin" <dberlin at dberlin dot org>, "Diego Novillo" <dnovillo at redhat dot com>, gcc at gcc dot gnu dot org
Date: Wed, 27 Sep 2006 23:47:04 +0100
Subject: Re: Making your branches smaller for easier merges
References: <4aca3dc20609271337o77f07fdalf85679754e7a80d1@mail.gmail.com> <4aca3dc20609271354y31343217t80ceeebbfac1c989@mail.gmail.com> <6c33472e0609271438o2827b48fm8fdc5e447dcbe470@mail.gmail.com>

> Why? Perhaps I am entirely wrong but can't you just don't update (svn
> up) those directories that are switched until mainline is in an usable
> state?

That's only feasible if you're the only person working on that branch, and you 
only ever use one checkout on one machine.

I guess you could use numbered trunk revisions, but that seems like harder 
work than just creating a full branch and doing the merge.

Paul

References:
- Making your branches smaller for easier merges
  - From: Daniel Berlin
- Re: Making your branches smaller for easier merges
  - From: Daniel Berlin
- Re: Making your branches smaller for easier merges
  - From: Manuel LÃpez-IbÃÃez

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]