patch failed, unable to continue

[Mahmood Naderan]

Well I read that but faced a big question.
The purpose of such revision control systems is to merge a file (for example) that has been modified by more than one developer.
The case stated in the page you mentioned, is very popular.

If I have to manually fix such modifications, then what is the need for revision control system?
 
// Naderan *Mahmood;


----- Original Message -----
From: Matt Mackall <mpm at selenic.com>
To: Mahmood Naderan <nt_mahmood at yahoo.com>
Cc: "mercurial at selenic.com" <mercurial at selenic.com>
Sent: Thursday, February 23, 2012 8:38 PM
Subject: Re: patch failed, unable to continue

On Thu, 2012-02-23 at 00:57 -0800, Mahmood Naderan wrote:
> Hi,When I run "qpush -a" to apply my patches, I get several errors. I have to say, prior to qpush, I ran these commands:
> 
> hg qinit -c
> hg qnew mahmood
> // modify a file src/mem/cache/BaseCache.py
> hg qrefresh
> hg qpop -a
> hg pull
> // found some changes
> hg update
> 
> After that I ran "hg qpush -a" to apply my own patch:
> applying mahmood
> ...
> patching file src/mem/cache/BaseCache.py
> Hunk #1 FAILED at 29
> Hunk #2 FAILED at 65
> 2 out of 2 hunks FAILED -- saving rejects to file src/mem/cache/BaseCache.py.rej
> ....
> patch failed, unable to continue (try -v)
> patch failed, rejects left in working dir
> errors during apply, please fix and refresh mahmood
> 
> 
> So what should I do now? What does that mean?

Read this:

http://mercurial.selenic.com/wiki/HandlingRejects

-- 
Mathematics is the supreme nostalgia of our time.