[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: |
Adrian Irving-Beer |
Subject: |
Re: [Gnu-arch-users] [arch advocacy] Games from Within: litmus test for revision control |
Date: |
Tue, 29 Mar 2005 15:06:55 -0500 |
User-agent: |
Mutt/1.5.6+20040907i |
On Tue, Mar 29, 2005 at 08:16:55PM +0200, Jan Hudec wrote:
> 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, ie. as 'bar/baz'. But I am quite sure it will not
> do this.
That's been my experience too. It also means that the result of a
merge will actually leave the tree in a non-tree-lint-clean state.
signature.asc
Description: Digital signature
- [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 <=
- 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
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, Magnus Therning, 2005/03/30