This is the mail archive of the
archer@sourceware.org
mailing list for the Archer project.
Some branches are temporarily based on gdb_7_1-branch now
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: archer at sourceware dot org
- Date: Sat, 27 Feb 2010 00:23:51 +0100
- Subject: Some branches are temporarily based on gdb_7_1-branch now
Hi,
specific only to (alphabetically):
archer-jankratochvil-fedora13
archer-jankratochvil-fortran-module
archer-jankratochvil-ifunc
archer-jankratochvil-vla
archer-jankratochvil-watchpoint
archer-keiths-expr-cumulative
archer-pmuldoon-next-over-throw
archer-tromey-delayed-symfile
archer-tromey-python
If you want to merge one of those with FSF GDB please use "gdb_7_1-branch" now
before gdb-7.1 gets released. The branches normally merge with "master".
No action is required on your part.
------------------------------------------------------------------------------
details:
Please ping me if you really want your branch to stay on "master" till gdb-7.1.
git://sourceware.org/git/archer.git now also contains "gdb_7_1-branch" merged
from git://sourceware.org/git/gdb.git
Sure the content (=diff) of the branches is still exactly/mostly the same.
Current git://sourceware.org/git/gdb.git state of 7.1 branching:
-22fa65e45a28207725d89c61acbc0083dfa69b8b first master specific commit
+41e17106591a72312b379380e0f0be89fce67056 first gdb_7_1-branch specific commit
e16b3828eafec635405cc34beb8f08db117d7331 last common commit
I have made a mistake already merging some branches with "master" which is
difficult to undo:
http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt
Therefore posting here their status for their later remerge with "master"
(=reverting "merge of gdb_7_1-branch" and reverting "reverted HASH").
archer-jankratochvil-fortran-module
65656cf091885749d01ec7fd990633f5e7557102 merge of gdb_7_1-branch
b29b9fac47db3971eaf5bbbf9fd8f6565657fb51 reverted 13b4014272fd999d15f4edf83cb5b142e47c1cf2
13b4014272fd999d15f4edf83cb5b142e47c1cf2 inappropriate merge of master
4ec1615209193f242d7656f16087a24155ea1989 first normal commit
archer-jankratochvil-ifunc
ce806793aa438b4c32c03081d77647e0289f22d3 merge of gdb_7_1-branch
fbb5d088b624a54d05342135bbbc2c6ca4883b82 reverted 25ed0d357da32a8f9e95ddff130ff59a0caae83b
25ed0d357da32a8f9e95ddff130ff59a0caae83b inappropriate merge of master
39737dfaea78edba89af8fc9fc3cb89c4fe56eba first normal commit
archer-jankratochvil-watchpoint
468708f2f54043916313c751eb5ec6640258f18e merge of gdb_7_1-branch
f300677af2cb0111b62d4e7bdbee878704f46b35 reverted 4983167dec791211e0483852272571a4c4975383
4983167dec791211e0483852272571a4c4975383 inappropriate merge of master
567c88d9904c315d11ce33f2ef7c06d9cee3c900 first normal commit
archer-pmuldoon-next-over-throw
b8920fe664c062d0b781bdc5526d3b0edb210fe3 merge of gdb_7_1-branch
5734e336a5bd829edc948ce709d376709087fb65 reverted 4d1367c726e210b6fb0877b8d81ba03dbbc051c6
4d1367c726e210b6fb0877b8d81ba03dbbc051c6 inappropriate merge of master
d3f54c3062fffb30920bd4646a959e58d6a641d1 first normal commit
archer-tromey-delayed-symfile
507e8e91081b342db0bd466a8bee8516385ee5d0 merge of gdb_7_1-branch
a2e143de4355cbd6483dee3cc581e02c9b4fd9c3 reverted 9fe406a8f32bfbdaaf819c8b638010c1c0b12aff
9fe406a8f32bfbdaaf819c8b638010c1c0b12aff inappropriate merge of master
9e99e7178634f6f71c8d7330818fa4122fec8e4a first normal commit
Thanks,
Jan