Issue 24311 - patch for CVSROOT/modules
Summary: patch for CVSROOT/modules
Status: CLOSED FIXED
Alias: None
Product: Infrastructure
Classification: Infrastructure
Component: _openoffice.org CVS (obsolete) (show other issues)
Version: current
Hardware: All All
: P3 Trivial (vote)
Target Milestone: ---
Assignee: Martin Hollmichel
QA Contact: issues@www
URL:
Keywords:
: 20752 (view as issue list)
Depends on:
Blocks:
 
Reported: 2004-01-12 12:42 UTC by Martin Hollmichel
Modified: 2004-01-15 17:02 UTC (History)
1 user (show)

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

Attachments
patch for CVSROOT/modules (10.30 KB, patch)
2004-01-12 12:44 UTC, Martin Hollmichel 		no flags Details | Diff
new patch for CVSROOT/modules (10.27 KB, patch)
2004-01-13 10:07 UTC, Martin Hollmichel 		no flags Details | Diff
patch for CVSROOT/modules (10.50 KB, patch)
2004-01-13 16:41 UTC, Martin Hollmichel 		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 Martin Hollmichel 2004-01-12 12:42:44 UTC 
please apply patch for CVSROOT/modules file
Comment 1 Martin Hollmichel 2004-01-12 12:44:18 UTC 
Created attachment 12436 [details]
patch for CVSROOT/modules
Comment 2 Unknown 2004-01-12 18:07:01 UTC 
The patch didn't apply cleanly- ops said it looks like something is off with
your starting version (See below)

we'll need a new patch to try this again


===================================================================
RCS file: modules,v
retrieving revision 1.3
diff -r1.3 modules
Get file modules from RCS with lock? [y] y
patching file modules
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 27 with fuzz 1.
Hunk #3 succeeded at 34 (offset -1 lines).
Hunk #4 succeeded at 58 with fuzz 2 (offset -1 lines).
Hunk #5 succeeded at 84 (offset -1 lines).
Hunk #6 succeeded at 117 (offset -1 lines).
Comment 3 Martin Hollmichel 2004-01-12 18:51:35 UTC 
this is not a surprise, please fix 24169 first.
Comment 4 Martin Hollmichel 2004-01-13 10:07:23 UTC 
Created attachment 12455 [details]
new patch for CVSROOT/modules
Comment 5 Martin Hollmichel 2004-01-13 16:38:13 UTC 
*** Issue 20752 has been marked as a duplicate of this issue. ***
Comment 6 Martin Hollmichel 2004-01-13 16:41:40 UTC 
Created attachment 12465 [details]
patch for CVSROOT/modules
Comment 7 Martin Hollmichel 2004-01-13 16:42:26 UTC 
added another lost alias (embeddedobj)
Comment 8 Unknown 2004-01-13 17:04:25 UTC 
I've updated the internal task with the two new patches. I'll update this issue
when they've been applied.
Comment 9 Unknown 2004-01-13 18:53:12 UTC 
modules.diff1 was applied by the operations group
but the second patch does not apply (modules.diff2) cleanly after the first one
has been applied.
Comment 10 Martin Hollmichel 2004-01-15 17:02:27 UTC 
marking as fixed.
Comment 11 Martin Hollmichel 2004-01-15 17:02:52 UTC 
and closing