Handling filesystem/inventory conflicts in TreeTransform

[Denys Duchier]

Aaron Bentley <aaron.bentley at utoronto.ca> writes:

> John A Meinel wrote:
>> So are you saying that if it cannot resolve filesystem conflicts, it
>> will not be able to merge from the other tree?
>
> Correct.  An example would be if you had
>
> foo
> foo.moved
> foo.moved.moved
> foo.moved.moved.moved
> foo.moved.moved.moved.moved
> foo.moved.moved.moved.moved.moved
> foo.moved.moved.moved.moved.moved.moved
> foo.moved.moved.moved.moved.moved.moved.moved
> foo.moved.moved.moved.moved.moved.moved.moved.moved
> foo.moved.moved.moved.moved.moved.moved.moved.moved.moved
>
> and you were trying to create a file named foo.  It handles average
> cases just fine.

How about using a timestamp?

    foo.moved.2006-02-14.21:31
or  foo.2006-02-14.21:31.moved    if that's easier to recognize

The repetition of .moved.moved.moved is not that unlikely, but with the
timestamp approach, it becomes a lot more unlikely.  Additionally, the timestamp
approach has the advantage that you see when the move took place.

Cheers,

--Denys