This is the mail archive of the
mailing list for the Archer project.
Re: Merging lessons
- From: Tom Tromey <tromey at redhat dot com>
- To: Rick Moseley <rmoseley at redhat dot com>
- Cc: Project Archer <archer at sourceware dot org>
- Date: Thu, 15 Jan 2009 17:33:12 -0700
- Subject: Re: Merging lessons
- References: <496F90F1.firstname.lastname@example.org>
- Reply-to: Tom Tromey <tromey at redhat dot com>
>>>>> "Rick" == Rick Moseley <email@example.com> writes:
Rick> 2) Do a rebase at least once a week
I'd prefer people merge from master, rather than rebase. IIUC,
rebasing doesn't work too well in a shared repository, but merging
I will endeavor to merge more frequently.
To anybody who does a future topic->release merge, please feel free to
harangue people into doing their master->topic merges as the right
Rick> The configure files rank right up there, IMHO, with ChangeLog as
Rick> being difficult to merge, make sure you have the latest version
Rick> before making any changes.
We can treat the generated files as outputs -- you don't have to merge
them at all, just regenerate them by running the tools.
What I do is download the proper auto* versions from ftp.gnu.org, then
install them into a fresh directory. Then I put the new $prefix/bin
in my $PATH whenever I need to run auto* on gdb.
It is pretty important to get the exact upstream version -- the tools
are version-sensitive and even if your distro does happen to package
that version, there is a fair chance there is an output-affecting
distro-specific patch in there.