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

Re: Edit conflicts suggestion

From: Judah Frangipane <judah-fc_at_t8design.com>
Date: 2006-01-24 00:41:22 CET

Thanks.

Nathan Kidd wrote:

> Judah Frangipane wrote:
>
>> Is there are reason why when there is a conflicting file, tortoise
>> creates a myfile.txt.r58 file? Would it be a good idea to create a
>> myfile.r58.txt instead?
>>
>> The reason is when we work with flash.fla files then we need to
>> rename the files for any associations to be maintained. We have to
>> rename them from .r50 to .fla to compare (open them up with the
>> associated program), then rename them back to the revision number.
>> Does that make sense?
>
>
> This is something Subversion does, and not TortoiseSVN, but as it
> happens this was recently discussed on the Subversion user's list.
> http://svn.haxx.se/users/archive-2006-01/0162.shtml
>
> My understanding was everyone basically agreed it was a good idea, and
> it was "just" a matter of some minor implementation details being
> worked out, and someone actually changing the code.
>
> -Nathan
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: users-help@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 Jan 24 00:41:31 2006

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