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

Re: Merging insanity

From: Ian Eure <ieure_at_enotes.com>
Date: 2005-09-09 17:28:13 CEST

On Sep 7, 2005, at 2:37 PM, Adam Gibson wrote:

> Dale R. Worley wrote:
>
>> On Wed, 2005-09-07 at 12:11 -0400, Adam Gibson wrote:
>>
>>> Would the concern with implementing CREATED be that everyone
>>> might think that would work for all branching methods and cause
>>> confusion?
>>>
>> The problem runs deeper than that -- you've described what you want
>> CREATED to in a very limited (albeit useful) set of
>> circumstances. But
>> you haven't given a specification that explains how CREATED is
>> interpreted in *all* possible circumstances, nor an algorithm that
>> shows
>> how that could be implmented. To do those things, you have to
>> deal with
>> all the dank corners of what might be going on.
>> For instance, does each file and directory carry a value of
>> CREATED? In
>> a WC, which item's CREATED controls how the command is executed?
>> If you
>> use multiple stages of branching, how does CREATED help? Etc., etc.
>> Dale
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: users-help@subversion.tigris.org
>>
>
> My limited understanding of SVN internals and svn lingo will
> probably mean my input on this will be rather limited but here goes
> an attempt to try and explain at least the basics.
>
> - The CREATED tag name would be something assigned to every file
> and directory and would be assigned to represent the revision
> number that the file was created by an import, copy, or move.
> - Any reference to CREATED by -r or @ would use the revision number
> that was stored for the file or directory that was referenced. If
> the URL is pointing to a file then the files CREATED revision is
> referenced or if a directory is referenced then the directories
> CREATED revision is used.
>
I would add:

- In the case that the file was created with `copy,' CREATED would be
the version which the copy was created from. E.g. version at 1, file
is copied, new version is 2. CREATED would be r1.

--
Ian Eure
Developer,
eNotes.com LLC
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 9 17:30:58 2005

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