quilt-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Quilt-dev] quilt fold failing when not in root directory?


From: jerome lacoste
Subject: [Quilt-dev] quilt fold failing when not in root directory?
Date: Sat, 20 Aug 2005 18:40:05 +0200

Hi

if I have a project.

Someone sends me a patch relative to a directory below the project's
root directory.

E.g.  with a layout like

cruisecontrol/main/docs
cruisecontrol/main/src
cruisecontrol/main/test
cruisecontrol/...

if I am in cruisecontrol/main

with a patch relative to main, quilf fold fails while patch works.

Is that a limitation to quilt fold? Or am I doing something wrong?

Cheers,

Jerome

worklog:
*********
address@hidden> pwd
/home/jerome/Dev/CruiseControl/cruisecontrol/main

address@hidden> patch -p 1 --dry-run < /home/jerome/New/RSSPublisher.diff 
patching file docs/configxml.html
Hunk #1 succeeded at 145 (offset 2 lines).
Hunk #2 succeeded at 271 (offset 4 lines).
Hunk #3 succeeded at 5889 (offset 126 lines).
patching file src/net/sourceforge/cruisecontrol/publishers/RSSPublisher.java
patching file 
src/net/sourceforge/cruisecontrol/publishers/rss/CruiseControlFeed.java
patching file 
src/net/sourceforge/cruisecontrol/publishers/rss/CruiseControlItem.java
patching file src/net/sourceforge/cruisecontrol/publishers/rss/Feed.java
patching file src/net/sourceforge/cruisecontrol/publishers/rss/Item.java
patching file src/net/sourceforge/cruisecontrol/publishers/rss/RSS.java
patching file 
test/net/sourceforge/cruisecontrol/publishers/RSSPublisherTest.java
patching file 
test/net/sourceforge/cruisecontrol/publishers/rss/CruiseControlFeedTest.java
patching file 
test/net/sourceforge/cruisecontrol/publishers/rss/CruiseControlItemTest.java
patching file test/net/sourceforge/cruisecontrol/publishers/rss/FeedTest.java
patching file test/net/sourceforge/cruisecontrol/publishers/rss/ItemTest.java
patching file test/net/sourceforge/cruisecontrol/publishers/rss/RSSFeed.xml

address@hidden> quilt fold -p 1 < /home/jerome/New/RSSPublisher.diff 
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u -r -N orig/docs/configxml.html new/docs/configxml.html
|--- orig/docs/configxml.html   2005-08-19 08:21:01.837104600 -0600
|+++ new/docs/configxml.html    2005-08-19 08:24:17.011644000 -0600
--------------------------
File to patch: ....




reply via email to

[Prev in Thread] Current Thread [Next in Thread]