[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Bug in tortoiseMerge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-11-09 20:32:25 CET

Anthony Ogier wrote:
> 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".

But you don't merge.

> * 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).

Here's the problem: the unified diff you get from the merge is not the
same as you would get if you would have completed the merge and then
choose TortoiseSVN->Create patch. And only patchfiles generated with
that command will actually work ok. Manually editing a patchfile, and
especially one not generated with "create patch" just isn't right and
leads to all kinds of errors.
The patch algorithm in TortoiseMerge can't handle patchfiles which don't
match exactly.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Nov 9 20:32:34 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.