Issue 28183 - 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: Unknown
QA Contact: issues@www
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-04-21 12:26 UTC by Martin Hollmichel
Modified: 2004-05-24 12:47 UTC (History)
4 users (show)

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

Attachments
patch for CVSROOT/modules (10.97 KB, patch)
2004-04-21 12:27 UTC, Martin Hollmichel 		no flags Details | Diff
new patch for CVSROOT/modules (10.37 KB, patch)
2004-04-23 10:47 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-04-21 12:26:05 UTC 
please add the aliases xmerge, apache-java and jvmfwk to the aliases
Comment 1 Martin Hollmichel 2004-04-21 12:27:12 UTC 
Created attachment 14675 [details]
patch for CVSROOT/modules
Comment 2 Unknown 2004-04-22 00:43:01 UTC 
I created pcn28204 to have this applied.
I will let you know when this is completed.

Eric
Comment 3 Unknown 2004-04-22 21:27:04 UTC 
this patch is failing. please review the patch.
Thanks

$ sudo gpatch --dry-run --verbose modules < patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: modules
|===================================================================
|RCS file: /cvs/CVSROOT/modules,v
|retrieving revision 1.16
|diff -u -r1.16 modules
|--- modules    23 Mar 2004 22:09:59 -0000      1.16
|+++ modules    21 Apr 2004 11:23:45 -0000
--------------------------
Patching file modules using Plan A...
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 16.
Hunk #3 succeeded at 29 (offset 1 line).
Hunk #4 FAILED at 37.
Hunk #5 FAILED at 46.
Hunk #6 succeeded at 178 (offset 2 lines).
Hunk #7 succeeded at 226 (offset 1 line).
4 out of 7 hunks FAILED -- saving rejects to file modules.rej
done

--------------------------------------------------------------------------------
Comment 4 Martin Hollmichel 2004-04-23 10:47:03 UTC 
Created attachment 14715 [details]
new patch for CVSROOT/modules
Comment 5 Martin Hollmichel 2004-04-23 12:34:26 UTC 
see new attachment for new patch
Comment 6 Unknown 2004-04-23 20:07:52 UTC 
I updated the internal issue with the new patch. I will let you know status from
here.
Eric
Comment 7 Martin Hollmichel 2004-04-28 16:42:43 UTC 
is there progress in sight ?

I have the next quite urgent patches prepared, but I need this get applied
first, otherwise the next patch again will fail.
Comment 8 Unknown 2004-04-28 18:03:29 UTC 
This should be completed today. I will check with ops again to make sure.
Eric
Comment 9 Unknown 2004-04-28 19:36:07 UTC 
The patch has been applied
Comment 10 Martin Hollmichel 2004-05-24 12:47:44 UTC 
close issue.