Re: Conflict file naming

On Jan 5, 2006, at 17:35, Gale, David wrote:

> Also, the current system ensures that the three files are as close as
> possible in an alphabetical listing. Putting the conflict
> extensions in
> the middle breaks that behavior, which is probably not a good thing.

I don't think it breaks it too much...

In the current behavior, the files are together:

foo.c
foo.c.r42
foo.c.r43
foo.c.mine
foo.h

In the proposed new scheme, it's not too much worse:

foo.c
foo.h
foo.mine.c
foo.r42.c
foo.r43.c

The compromise that meets both goals (the old goal of keeping files
together and the new goal of having the correct extension) is to
repeat the extension:

foo.c
foo.c.r42.c
foo.c.r43.c
foo.c.mine.c
foo.h

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 5 19:42:29 2006