RE: Merge local file diffs

> On 2/7/06, Sven Kirchner <Sven.Kirchner@innomea.com> wrote:
> > Let's say there is a C# file Construct.cs, revision 100.
> >
> > I modify this file and commit to rev 101.
> >
> > Meanwhile someone sends me a modified Construct.cs (presumably based
on
> rev 100, but it could be based on an even earlier rev).
> >
> > What I want to do now is to merge his changes and my changes (100 to
> 101) to a new revision, let's say rev 102.
> >
>
> Tell them to not send you the whole file but a patch. Then
> TortoiseMerge can apply that patch - it will automatically retreive
> the file in revision 100 to do the merge if necessary.
>
> Stefan

That's exactly the problem. If I had any means of controlling the files
I receive I wouldn't be in this trouble.

PS: Just curious, never used the patch feature of TSVN. It contains a
revision number?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Feb 7 12:03:28 2006