Question On Transplant Extension

[Carlo Camerino]

apply changeset? [ynmpcq?]: y
changeset:   638:dea0d01486c7
parent:      615:6a47d95e0a82
user:        jm
date:        Wed Jul 08 14:32:32 2009 +0800
summary:     committing changes in auditlogreport

apply changeset? [ynmpcq?]: c
applying 6aae7d87a9c2
patching file pom.xml
Hunk #1 FAILED at 9
1 out of 1 hunks FAILED -- saving rejects to file pom.xml.rej
patch failed to apply
abort: Fix up the merge and run hg transplant --continue

i keep on getting this error,

what can i do to resolve this?
it says hunk #1 failed.

On Wed, Jul 8, 2009 at 2:05 AM, Brendan Cully <brendan at kublai.com> wrote:

> On Wednesday, 08 July 2009 at 01:47, Carlo Camerino wrote:
> > C:\PROJECTS\DIGIBANKER\citrine-parent-five>hg transplant -s c:/projects/
> > bdo-rib-
> > demo/bdo-rib-demo-two
> > searching for changes
> > changeset:   641:b2da77fcea8d
> > tag:         tip
> > user:        carloc
> > date:        Wed Jul 08 01:44:15 2009 +0800
> > summary:     aa
> >
> > apply changeset? [ynmpcq?]:
> >
> > Hi ,
> >
> > Iwas wondering what does this mean?
> > I understand the meaning of p which means to show changes.
> >
> > n is to skip the change.
> >
> > What does c do?
> >
> > what is the different between y and p?
> >
> > Sorry i'm just confused on their usage
>
> Did you try '?' ?
>
> 'p' just shows you the change to help you decide whether you want it.
> 'y' queues it up to be applied.
> 'n' skips this change.
> 'c' actually applied all the changesets you queued up with 'y'.
> 'q' aborts.
>
> You won't generally want to use 'm' at all.
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20090708/ecadd77c/attachment.htm