Difference between revisions of "Upd merge history"
From DIDEAS Wiki
m |
m |
||
| Line 13: | Line 13: | ||
* TA S1:io_chan.h | * TA S1:io_chan.h | ||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | == files that | + | == files that have forked == |
*ap_header.c, io_adc.c, tk_cmdset.c | *ap_header.c, io_adc.c, tk_cmdset.c | ||
| Line 35: | Line 30: | ||
=== tk_cmdset.c==== | === tk_cmdset.c==== | ||
* take S1:tk_cmdset.c lines 539-546 push into S2 | * take S1:tk_cmdset.c lines 539-546 push into S2 | ||
| + | |||
| + | |||
| + | ==files that will remain different== | ||
| + | *tk_cmdset.c : changed by both - see above | ||
| + | *io_adc.c : changed by both -see above | ||
| + | *ap_header.c : changed by both, ignore DY changes | ||
| + | *ap_header.h : changed by CEB only | ||
| + | *hostcmds.h : changed by CEB only | ||
| + | *tk_fup.c : changed by CEB only | ||
Revision as of 01:54, 22 February 2009
Contents
merge of PEDANT Rev 521 to 437
- source1: svn://pedant/PowerFoot/branches/dyoung/StateControl-dev : 521
- source2: svn://pedant/PowerFoot/branches/cbarn/StateControl : 547
- destination :
actions
- take all of S1:tarerror.h
- take all of S1:tarmap.h
- take all of S1:tk_rttimer.c
- TA S1:io_spi.c, io_spi.h
- TA S1:io_dig.c, io_dig.h
- TA S1:io_chan.h
files that have forked
- ap_header.c, io_adc.c, tk_cmdset.c
ap_header.c
- ignore DY changes
io_adc.c
- 3 significant differences
- ADC channel maping change : apply lines 143, 150 to same
- 2 places where macros used to return ecodes
- lines 461-467
- lines 564-571
tk_cmdset.c=
- take S1:tk_cmdset.c lines 539-546 push into S2
files that will remain different
- tk_cmdset.c : changed by both - see above
- io_adc.c : changed by both -see above
- ap_header.c : changed by both, ignore DY changes
- ap_header.h : changed by CEB only
- hostcmds.h : changed by CEB only
- tk_fup.c : changed by CEB only
