On Thu, Jul 22, 2010 at 4:21 PM, Andreas Haferburg
> 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?
It is how Subversion (svn diff) works. It gives you a diff against
the copied base file. So, for example, if you modified a couple of
lines it would show those lines in the diff output.
There are going to be some new options coming in Subversion 1.7. One
option is to tell diff to just treat the copy like an add and show all
the lines as added. The other is a new patch file format that has a
way to include the copy-from information. This would not work with
the Eclipse Apply Patch wizard though. It will work with a new svn
patch command being added to the Subversion command line.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-07-22 22:40:39 CEST