Re: [RFC] Third round of support for cloning submodules

hoi :)

On Tue, May 22, 2007 at 11:54:23PM +0200, Alex Riesen wrote:

Martin Waitz, Mon, May 21, 2007 01:12:01 +0200:

quoted

On Mon, May 21, 2007 at 01:02:48AM +0200, Alex Riesen wrote:

quoted

quoted

If the user did commit and then you do a supermodule checkout -m you
will get a merge.

Only if the user continue to use the last branch (or the detached
head) the subproject was on. He don't have to, he can even return to
the commit which does not conflict, unless he have to complicate
things.

just curious:
so you want to differenciate between a subproject HEAD which was
set by the superproject and other ones?

No. Why do you think that I want to do that?

I think I simply was too tired to read. ;-)

Your 'Only if the user continues to use...' suggested that he has a
different option, namely going to a branch which is not controlled
by the superproject.

And of course the user can go back to another commit, after checkout -m
created a merge... ;-)

-- 
Martin Waitz