OK, I'm working on integrating an open source project which has its own
svn. For our developments, we have a copy of that svn in our own svn.
Sometimes, I must merge the updates made on the official project to our
own version.
To do that,
* I checkout the official trunk with the last revision I've merged
into our version (let's call that revision X), and then
TortoiseSVN > Merge.
* Here, I fill "from revision" with X, and "to HEAD revision" and I
get the "Unified diff".
* I edit the generated .patch and replace all the "--- ... (revision
X)" with "--- ... (revision Y)" (Y is our current trunk revision),
and "+++ ... (revision Z)" with "+++ ... (working copy)" (Z is the
current official trunk revision).
* I go into our version of the project, TortoiseSVN > Apply patch...
and select the patch.
I then got a list of files, representing all the modified files of the
original trunk, but the files with same name (here, all "pom.xml") exept
one of them, are red. When I double click on them, I got the error "The
file <subdir path>\pom.xml was found twice!?! This usually happens if
you applied a patchfile to the wrong folder!".
However, I'm sure we have the same source structure as the original
trunk and that I'm applying the patch to the correct folder (when I try
to apply the patch elsewhere, I got an error message directly without
getting the list of files to update).
Here is an example of structure :
project/pom.xml
project/module_1/pom.xml
project/module_2/pom.xml
and the lines in the final patch file are like :
Index: pom.xml
=====================
--- pom.xml (revision Z)
+++ pom.xml (working copy)
@@ ... @@
...
Index: module_1/pom.xml
=====================
--- module_1/pom.xml (revision Z)
+++ module_1/pom.xml (working copy)
@@ ... @@
...
Index: module_2/pom.xml
=====================
--- module_2/pom.xml (revision Z)
+++ module_2/pom.xml (working copy)
@@ ... @@
...
And I'm applying the patch to the "project" folder ...
Perhaps I'm not doing well the merge... but as I'm in to different
repositories server, I cannot only click on "Merge" button, because if
there a file deletion or folder properties modification, then I got an
error telling me I'm not in the right svn server.
Thanks for the reply Stefan,
Anthony
Stefan Küng a écrit :
> Anthony Ogier wrote:
>> Hi list,
>>
>> I'm using TSVN 1.4.0 (build 7501) and I still get the same problem.
>> I'm trying to apply a patch for a maven project, which has a
>> "pom.xml" file in each subdirectory of the project. In my patch,
>> there is multiple references to files name "pom.xml", one in each
>> subdirectory.
>> When applying the patch, I got "The file <subdir path>\pom.xml was
>> found twice!?! This usually happens if you applied a patchfile to the
>> wrong folder!"
>>
>> Does someone know if the bug was *really* corrected ?
>
> Yes, that bug was fixed. But if you are absolutely *sure* that you try
> to apply the patch to the correct folder, and of course that the
> patchfile is valid, then you have to provide us with much more
> information so we can reproduce this.
>
> Stefan
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Nov 9 10:26:12 2006