This is the mail archive of the
gdb@sourceware.org
mailing list for the GDB project.
[DOC] gdbint.texi
- From: Nick Roberts <nickrob at snap dot net dot nz>
- To: gdb at sources dot redhat dot com
- Date: Thu, 31 Aug 2006 09:41:20 +1200
- Subject: [DOC] gdbint.texi
The Internals manual says:
`OWNER_NAME-YYYYMMDD-mergepoint'
The tagged point, on the mainline, that was used when merging the
branch on YYYYMMDD. To merge in all changes since the branch was
cut, use a command sequence like:
cvs rtag OWNER_NAME-YYYYMMDD-mergepoint gdb
cvs update \
-jOWNER_NAME-YYYYMMDD-branchpoint
-jOWNER_NAME-YYYYMMDD-mergepoint
Similar sequences can be used to just merge in changes since the
last merge.
but CVS merges from the greatest common ancestor, so I think fo the update just
cvs update \
-jOWNER_NAME-YYYYMMDD-mergepoint
would do.
Also for a second merge I guess something like
cvs update \
-jOWNER_NAME-FIRST_DATE-mergepoint
-jOWNER_NAME-SECOND_DATE-mergepoint
is needed.
If this is right I'll submit a patch.
--
Nick http://www.inet.net.nz/~nickrob