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

Re: Merge local file diffs

From: Rainer Müller <mueller_rainer_at_gmx.de>
Date: 2006-02-07 18:15:22 CET

Tobias Schäfer wrote:
> On Tuesday 07 February 2006 14:04, Sven Kirchner wrote:
>> Believe me, I have gone far explaining the situation. Having said that,
>> it is impossible to get the other side to do anything other than sending
>> copies of files.
>
> Why don't you ask them to not only send you the edited files but also the
> files they based their work on? Then you can create the patch yourself and
> apply it to HEAD.

I think this is not possible, because from my experience such users normally
just start working and do not preserve the original files. So you would have to
tell them how to do that and then teaching them (Sub)version control directly
might probably be easier?

Rainer

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Feb 7 18:15:34 2006

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