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

Re: Re: Merge local file diffs

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-02-07 11:29:00 CET

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.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Feb 7 11:29:10 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.