Hi Mirko, As far as I can see, Tortoise is not bundled with a
svn-exectuable.The GUI is quite smart: it recognizes is you try to patch from
the wrong directory and will suggest the correct working directory.In this case
it won't work: Folder a and b don't exist, so there's nothing to resolve. I
can't bypass this issue, because there's no -pX option available in the GUI,
neither through the settings. -Robert > From: [email protected]
> Date: Tue, 19 Jun 2012 08:48:49 +0200
> To: [email protected]
> Subject: Re: [mojo-dev] Patch page for contributions through GIT
>
> I see svn has "svn patch" as well, so when you have Tortoise
> installed, you should be able to invoke this as well .-).
>
> Regards Mirko
>
> On Fri, Jun 15, 2012 at 12:08 AM, Robert Scholte <[email protected]>
> wrote:
> > Right, let me rephrase that:
> > I've been spoiled with Windows and use both Eclipse and Tortoise* to do all
> > the SCM-stuff.
> > I never had trouble with these tools until I saw the first GIT-patches.
> > So it seems like I need a new commandline tool to do this for me for these
> > special cases.
> > At least it's a oneliner ;)
> >
> >> From: [email protected]
> >> Date: Thu, 14 Jun 2012 23:48:53 +0200
> >
> >> To: [email protected]
> >> Subject: Re: [mojo-dev] Patch page for contributions through GIT
> >>
> >> cd to jaxb2-maven-plugin maven module
> >> wget
> >> https://jira.codehaus.org/secure/attachment/60257/jaxb2-maven-plugin-trunk.patch
> >> patch -p1 < jaxb2-maven-plugin-trunk.patch
> >>
> >> 2012/6/14 Robert Scholte <[email protected]>:
> >> > @Olivier I can't apply this patch[1] on the project.
> >> >
> >> > these are the first 4 lines:
> >> > diff --git a/src/main/java/org/codehaus/mojo/jaxb2/AbstractXjcMojo.java
> >> > b/src/main/java/org/codehaus/mojo/jaxb2/AbstractXjcMojo.java
> >> > index 2295a2d..4a2bbe6 100644
> >> > --- a/src/main/java/org/codehaus/mojo/jaxb2/AbstractXjcMojo.java
> >> > +++ b/src/main/java/org/codehaus/mojo/jaxb2/AbstractXjcMojo.java
> >> >
> >> > What to do here?
> >> > And I've seen more patches like these, so it looks like a general
> >> > problem to
> >> > me.
> >> >
> >> > -Robert
> >> >
> >> > [1]
> >> >
> >> > https://jira.codehaus.org/secure/attachment/60257/jaxb2-maven-plugin-trunk.patch
> >> >
> >> >> From: [email protected]
> >> >> Date: Thu, 14 Jun 2012 23:31:26 +0200
> >> >> To: [email protected]
> >> >> Subject: Re: [mojo-dev] Patch page for contributions through GIT
> >> >
> >> >>
> >> >> AFAIK Nothing prevent to sync back to codehaus svn.
> >> >> And regarding mirroring some volunteers need to take care of that....
> >> >> @Robert WDYM with "mystery how to translate them to usable svn-patches"
> >> >> ?
> >> >> You can take the patch from the pull request ?
> >> >>
> >> >> 2012/6/14 Jesse Farinacci <[email protected]>:
> >> >> > Greetings,
> >> >> >
> >> >> > On Thu, Jun 14, 2012 at 4:17 PM, Robert Scholte
> >> >> > <[email protected]>
> >> >> > wrote:
> >> >> >>
> >> >> >> I see more and more patches being provided from a GIT-fork of our
> >> >> >> projects.
> >> >> >> To me it's still a mystery how to translate them to usable
> >> >> >> svn-patches.
> >> >> >> I think it's an illusion that we can force the contributors to
> >> >> >> provide
> >> >> >> only
> >> >> >> svn-patches, so I'd like someone to write a page how we can
> >> >> >> transform
> >> >> >> such
> >> >> >> patches.
> >> >> >
> >> >> > I'm glad you bring this up. One of the codehaus plugins is actively
> >> >> > developed on GitHub. Lots of patches there, and it seems that the
> >> >> > GitHub repo is the canonical one.. I'm not sure what to do.
> >> >> >
> >> >> > I thought there was an attempt to get some sort of mirroring going
> >> >> > on,
> >> >> > but that may have stalled.
> >> >> >
> >> >> > -Jesse
> >> >> >
> >> >> > --
> >> >> > There are 10 types of people in this world, those
> >> >> > that can read binary and those that can not.
> >> >> >
> >> >> > ---------------------------------------------------------------------
> >> >> > To unsubscribe from this list, please visit:
> >> >> >
> >> >> > http://xircles.codehaus.org/manage_email
> >> >> >
> >> >> >
> >> >>
> >> >>
> >> >>
> >> >> --
> >> >> Olivier Lamy
> >> >> Talend: http://coders.talend.com
> >> >> http://twitter.com/olamy | http://linkedin.com/in/olamy
> >> >>
> >> >> ---------------------------------------------------------------------
> >> >> To unsubscribe from this list, please visit:
> >> >>
> >> >> http://xircles.codehaus.org/manage_email
> >> >>
> >> >>
> >>
> >>
> >>
> >> --
> >> Olivier Lamy
> >> Talend: http://coders.talend.com
> >> http://twitter.com/olamy | http://linkedin.com/in/olamy
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe from this list, please visit:
> >>
> >> http://xircles.codehaus.org/manage_email
> >>
> >>
>
> ---------------------------------------------------------------------
> To unsubscribe from this list, please visit:
>
> http://xircles.codehaus.org/manage_email
>
>
