Re: Applying a valid patch with TortoiseSvn 1.4.1 or TortoiseMerge fails

Hi,

> Do you start TortoiseMerge manually? Why?

Yes, from a batch file.

> TortoiseMerge is designed to work with Subversion working copies.
> And if a file doesn't match the patchfile exactly, TortoiseMerge
> tries to fetch the file from the repository without the modifications.
> Seems you try to apply a patch to a folder which isn't under version
> control, then TMerge can't fetch the required file and the patching will
fail.

Yes, this is what I do. I did not know that this is not possible. Maybe you
can give me some hints how to solve this problem:

I have two versions of my source code. The first version is called
"release". This is the version which all customers use. Errors are fixed in
this version. It is managed in a SVN repository.

The second version is called "development", this is where all new
enhancements are made. This version is managed in a completely independent
SVN repository.

Now I am looking for a capable way to move all the changed that were made
tot he "release" version into the "developers" version. I know that this may
cause conflicts, but I am confident that the code lines where the bugs were
fixed are not the same lines which had to be changed for the enhancements. I
thought I could use the TMerge patch feature here.

Carsten

P.S.: I have to reply manually because I failed to confirm mailing list
subscription (fixed now).