[Subclipse-users] Create patch after merge, files with status "added, copied" missing

Hello Subclipse,

I use Subclipse 1.6.12 and Eclipse 3.5.2. I just merged a branch back
into the trunk, and there were a couple of files added by the merge
operation. The merging went fine, no complaints there.
For the merge I used the following command (via "Merge two different
trees"), if that's somehow important.
merge --ignore-ancestry trunkURL_at_HEAD branchURL_at_HEAD localPath

But when I use Team->Create Patch, none of the added files make it into
the patch. The files are added to version control (it's grayed out in
the Team menu). When I look at the SVN tab in their Properties, under
Status it says "added, copied", and under Properties Status it says
"non-svn". The correct source URL from the branch is listed under
"Copied from URL".

So, how do I get these files into a patch? Is that a bug? Did I do
something wrong?

One possible workaround is to copy the file, delete the original, rename
the copy back to the original name, then Team->add to version control.
If the Status says "added", creating a patch seems to work.

Thanks,
Andreas

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2637033

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-07-22 22:29:25 CEST