Issue 64239 - offapi/prj/build.lst conflict resolution wrong
Summary: offapi/prj/build.lst conflict resolution wrong
Status: CLOSED FIXED
Alias: None
Product: Build Tools
Classification: Code
Component: code (show other issues)
Version: current
Hardware: All All
: P1 (highest) Trivial (vote)
Target Milestone: ---
Assignee: oliver.bolte
QA Contact: issues@tools
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-04-10 23:06 UTC by pavel
Modified: 2006-04-11 13:41 UTC (History)
3 users (show)

See Also:
Issue Type: DEFECT
Latest Confirmation in: ---
Developer Difficulty: ---

Attachments
Proposed patch (2.51 KB, patch)
2006-04-10 23:28 UTC, pavel 		no flags Details | Diff
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description pavel 2006-04-10 23:06:07 UTC 
Current m163:

idlc: compile './modules.idl' ... 
idlc: returned successful
Sun Microsystems (R) idlc Version 1.1

rm -f ../../../unxlngi6.pro/ucr/css.db
regmerge ../../../unxlngi6.pro/ucr/css.db UCR @/tmp/mkRT4igz
rm -f ../../../unxlngi6.pro/ucrdoc/css.db
regmerge ../../../unxlngi6.pro/ucrdoc/css.db UCR @/tmp/mkXRyPjM
/disk3/oo/BuildDir/ooo_SRC680_m163_src/offapi/util
dmake:  Error: -- `../unxlngi6.pro/ucr/cssfinsp.db' not found, and can't be made
'---* tg_merge.mk *---'

ERROR: Error 65280 occurred while making
/disk3/oo/BuildDir/ooo_SRC680_m163_src/offapi/util

Compare:

pavel@paveljanik:~/.ooo/ooo_SRC680_m163_src/offapi/prj> cvs diff -r 1.76 -r 1.77
build.lst

oa_finsp and oa_inspection were deleted but are still needed. Please bring them
back.
Comment 1 pavel 2006-04-10 23:28:27 UTC 
Created attachment 35625 [details]
Proposed patch
Comment 2 oliver.bolte 2006-04-11 08:47:35 UTC 
Hi Pavel, fixed now. I've oversight this, sorry. :-(
Comment 3 oliver.bolte 2006-04-11 08:48:54 UTC 
verified.
Comment 4 oliver.bolte 2006-04-11 13:41:24 UTC 
closed.