[svk-users] Patch and svk mirror depot
CMT Habitat
cmt.bin at gmail.com
Sun Jan 18 10:42:45 EST 2009
Hi,
I have a Debian server with a mirror of the "OFBiz" trunk
SVK is my version control
My mirror depot path is //mirror/VendorOfbiz/trunk
My local depot path is //local/customOfbiz/trunk
When I implemented this version control solution, I didn't think of patching
If I create a patch, I type :
svk diff //mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
//local/customOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
> ./Patch/getTotalListPrice_ProductConfigWrapper.java.patch
And I have to modify my patch file to rewrite the path
from :
--- ProductConfigWrapper.java (/mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) (revision 7214)
to :
--- ProductConfigWrapper.java (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) (revision 7214)
When I have several modified files, I manually create my main patch adding each patch ( because I have another changes into a sub-directory).
Committers tell me :
* I guess you use a local repository because you have a revision 7215 number
* I don't know how you generated your patch but I get this error
D:\workspace\ofbizRun>patch -p0 0<ProductImageAutoScale.patch
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|´??=== entitymodel.xml
|==================================================================
|--- entitymodel.xml (applications/product/entitydef/entitymodel.xml) (revision 7215)
|+++ entitymodel.xml (applications/product/entitydef/entitymodel.xml) (revision 7215)
Do you have a solution ?
Have I to delete my mirror to direct update from the official OFBiz trunk ?
Thank you very much in advance
Eric
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.bestpractical.com/pipermail/svk-users/attachments/20090118/4c8fedec/attachment.htm
More information about the svk-users
mailing list