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 mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
