news <news@sea.gmane.org> wrote on 07/28/2006 04:22:22 PM:
> Mark Phippard wrote:
> > [...] How could any disconnected
> > SCM tool manage folder versions and not have this issue?
>
> On the ClearCase a folder was changed when a file was added or removed
> from it or renamed in it. Thus, it had to be checked out (and checkin
> afterwards), too.
>
> But maybe I'm worrying too much about it. Could it be possible that the
> merge conflict was only issued for the folder because I changed some
> properties of the folder, i.e. would committing files work right away
> without an update of the folder first?
A folder has to be "up to date" in order to set properties on that folder
OR to delete/rename an existing child item. You can add/modify files all
you want without needing the folder to be up to date. So you could
generally work for a long time without ever running into this. Of course
if you are in a multiple developer environment it is likely you are going
to be running update on a regular basis anyway. This problem is really at
its worst in a single developer environment because it is hard for a
single developer to understand how their project can be out of date when
they are the only person to work on it.
I believe a folder's revision is updated in the repository when any child
item beneath it is modified in any way.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Jul 28 22:31:16 2006