This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: New SVN Wiki page
- From: "Giovanni Bajo" <giovannibajo at libero dot it>
- To: "Mike Stump" <mrs at apple dot com>
- Cc: <gcc at gcc dot gnu dot org>
- Date: Tue, 25 Oct 2005 09:50:40 +0200
- Subject: Re: New SVN Wiki page
- References: <djjf38$9ec$1@sea.gmane.org> <B618434E-8280-4519-B913-3009E44623F2@apple.com>
Mike Stump <mrs@apple.com> wrote:
> Ok, question about the merge tool. Does revision N mean all changes
> that predate N that apply, or just N-1 to N?
N-1 to N. You can specify a single commit and it will apply only that.
> So, let's say that 3, 4, 5, 6, 7 are available, can I merge 3 today,
> then 6, the next day, then 5, then all the rest (4 and 7) the next
> day? If yes, this corresponds to a N-1 to N above.
Yes. The good thing is that it'll keep track of what you've merged, so the list
of available revisions will trim down as you go.
> Could you update the doc to reflect your answer.
Uhm, I'm not sure how to explain this without being too pedantic. Does this
sound clearer?
"""
To do partial merges or cherry-picking, you can pass -r/--revision to svnmerge
merge and name the single commit (or range of commits).
"""
Giovanni Bajo