You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-dev@db.apache.org by Laura Stewart <sc...@gmail.com> on 2007/02/15 21:19:08 UTC
More questions on commits
Hi -
I'm trying to commit another patch, this time one of my own.
The message that I get back on a file is:
Reversed (or previously applied) patch detected! Assume -R? [n]
I do have 3 patches in the trunk directory, all with different names.
I specified the correct patch in the "patch" command.
Not sure what to do about this messege. Suggestions? Explanations?
--
Laura Stewart
Re: More questions on commits
Posted by Laura Stewart <sc...@gmail.com>.
Thanks Andrew, very helpful !!
On 2/15/07, Andrew McIntyre <mc...@gmail.com> wrote:
> On 2/15/07, Laura Stewart <sc...@gmail.com> wrote:
> > Hmmm, I think I see my error... since it is my patch, I don't have to
> > apply the patch? Just proceed directly to commit?
>
> Correct. Also, if you have multiple patches applied in a directory,
> you can add the files/directories to the svn commit command and only
> commit those files. e.g. if you had a patch to getting started and the
> reference manual in the same commit, you could commit just the getting
> started one with:
>
> svn commit -m "getting started patch" src/getstart
>
> andrew
>
--
Laura Stewart
Re: More questions on commits
Posted by Andrew McIntyre <mc...@gmail.com>.
On 2/15/07, Andrew McIntyre <mc...@gmail.com> wrote:
> e.g. if you had a patch to getting started and the
> reference manual in the same commit
just to be totally clear, i mean 'same checkout' here...
Re: More questions on commits
Posted by Andrew McIntyre <mc...@gmail.com>.
On 2/15/07, Laura Stewart <sc...@gmail.com> wrote:
> Hmmm, I think I see my error... since it is my patch, I don't have to
> apply the patch? Just proceed directly to commit?
Correct. Also, if you have multiple patches applied in a directory,
you can add the files/directories to the svn commit command and only
commit those files. e.g. if you had a patch to getting started and the
reference manual in the same commit, you could commit just the getting
started one with:
svn commit -m "getting started patch" src/getstart
andrew
Re: More questions on commits
Posted by Laura Stewart <sc...@gmail.com>.
Hmmm, I think I see my error... since it is my patch, I don't have to
apply the patch? Just proceed directly to commit?
On 2/15/07, Laura Stewart <sc...@gmail.com> wrote:
> Hi -
>
> I'm trying to commit another patch, this time one of my own.
> The message that I get back on a file is:
>
> Reversed (or previously applied) patch detected! Assume -R? [n]
>
> I do have 3 patches in the trunk directory, all with different names.
> I specified the correct patch in the "patch" command.
>
> Not sure what to do about this messege. Suggestions? Explanations?
>
> --
> Laura Stewart
>
--
Laura Stewart
Re: More questions on commits
Posted by Andrew McIntyre <mc...@gmail.com>.
On 2/15/07, Laura Stewart <sc...@gmail.com> wrote:
> Hi -
>
> I'm trying to commit another patch, this time one of my own.
> The message that I get back on a file is:
>
> Reversed (or previously applied) patch detected! Assume -R? [n]
>
> I do have 3 patches in the trunk directory, all with different names.
> I specified the correct patch in the "patch" command.
This would indicate that the file already has the difference described
in the patch file, usually meaning that you are trying to apply the
patch a second time.
If you want to be sure that only what is in the patch is committed,
revert everything with 'svn revert -R .' and then apply the patch
again and commit.
andrew