Applying patches as a non-committer?

[Barrie Treloar <ba...@gmail.com>]

I have 3 patches I want to apply.

But after I have applied the first patch, all the other patches will
fail with Hunk #28 FAILED at XXXX errors because the original file
doesn't match the what the patch expects.

This leads me to think I need a local subversion repository installed
with a Vendor branch (see
http://svnbook.red-bean.com/nightly/en/svn-book.html) and I need to
load into the vendor branch the revisions as listed in the patch
files.  Then I can merge the vendor branch changes over into my local
changes.

This is all new to me but the committers must do something similar
when applying patches and facing failed hunks.  Is anyone able to
provide guidance or links to docs on the web somewhere.  Google isn't
being my friend today.

Cheers.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org

Re: Applying patches as a non-committer?

[Brett Porter <br...@apache.org>]

We generally do them one at a time. We should do them faster so there is 
less of a problem, but the fact that they get out of date, or don't 
quite work as they should makes that a slow process.

You'll need to manually add the rejections after the sources have 
changed. If you want to keep them separate, you can use a vendor branch 
as you said, or you might like to try out svk, which is an alternate 
client for subversion repositories (and you can commit changes locally 
and keep track of each changeset individually before pushing them out to 
the remote repo or picking up changes). I haven't used it extensively, 
but it looks pretty neat. No tool integration though, unfortunately (and 
more commands to learn :)

Cheers,
Brett

On 27/07/2006 1:03 PM, Barrie Treloar wrote:
> I have 3 patches I want to apply.
> 
> But after I have applied the first patch, all the other patches will
> fail with Hunk #28 FAILED at XXXX errors because the original file
> doesn't match the what the patch expects.
> 
> This leads me to think I need a local subversion repository installed
> with a Vendor branch (see
> http://svnbook.red-bean.com/nightly/en/svn-book.html) and I need to
> load into the vendor branch the revisions as listed in the patch
> files.  Then I can merge the vendor branch changes over into my local
> changes.
> 
> This is all new to me but the committers must do something similar
> when applying patches and facing failed hunks.  Is anyone able to
> provide guidance or links to docs on the web somewhere.  Google isn't
> being my friend today.
> 
> Cheers.
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
> 


-- 
Apache Maven - http://maven.apache.org/
Better Builds with Maven - http://library.mergere.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org