[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for
From: |
Robert Anderson |
Subject: |
Re: [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for revision control |
Date: |
Tue, 29 Mar 2005 11:38:36 -0800 |
On Tue, 29 Mar 2005 20:16:55 +0200, Jan Hudec <address@hidden> wrote:
> On Tue, Mar 29, 2005 at 11:59:06 -0600, Gustavo Córdova Avila wrote:
> > Florian Weimer wrote:
> >
> > >* Magnus Therning:
> > >
> > >
> > >>Of course Arch doesn't suffer from the shortcoming, and it passes the
> > >>"litmus test" with flying colours.
> > >>
> > >>
> > >Really? Does it correctly handle newly added files in renamed
> > >directories?
> > >
> > >
> > >
> > Such a trivial test?
> >
> > It would really surprise me if you can find such a use-case which fails.
>
> I have not tried, but I think this would not work out:
>
> 1) Have a project with 'foo' directory.
> 2) Branch it
> 3) On one branch rename the 'foo' directory to 'bar'
> 4) On another branch create file 'foo/baz'
> 5) Merge.
>
> Now correct behaviour would be to place the 'baz' file in the renamed
> directory.
I think your definition of "correct behavior" is potentially
debatable, but I agree that this is probably the best definition and I
did confirm that it does not work like that.
The changeset records the addition of the file using named path
elements, not the logical identities of the path elements.
Tom, can you comment on this? This seems like a pretty fundamental
design point.
Bob
- [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for revision control, Magnus Therning, 2005/03/29
- Re: [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for revision control, Florian Weimer, 2005/03/29
- Re: [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for revision control, Adrian Irving-Beer, 2005/03/29
- Re: [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for revision control, Tom Lord, 2005/03/29
- Re: [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for revision control, Jan Hudec, 2005/03/29
- Re: [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for revision control, Tom Lord, 2005/03/30
- Re: [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for revision control, Jan Hudec, 2005/03/31
- Re: [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for revision control, Tom Lord, 2005/03/31
- Re: [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for revision control, Tom Lord, 2005/03/29