Re: [Subclipse-users] 1.1.4: Merge conflict during commit in freshly shared project

Mark Phippard <markp@softlanding.com> wrote on 28.07.2006 21:27:51:

> news <news@sea.gmane.org> wrote on 07/28/2006 03:19:45 PM:
>
> > Mark Phippard wrote:
> > > No, sharing a project creates a folder for the project in the
> repository
> > > and then checks it out. That puts the folder at r1. Now you commit

> files
> > > in r2. The folder is still at r1.
> >
> > Why is it still at r1? So after sharing a project and adding and
commit
> > files in it, part of my project is at r2 and part of my project is at
> > r1? That is somehow inconvenient. If I share a project through the
Share
> > Project wizard and commit files as part of this process then I would
> > expect to continue any operation after that without any error message.
>
> We could add an update to the end of the Share Project process but that
is
> only one scenario. As soon as you do one more commit you are back in
the
> same situation.

You know Mark, I think he has a point in this exact scenario. After all a
user is sharing a project, which implies that nothing should have happened
to the folder between folder creation and adding files to it. After all,
you are sharing your project, why should anyone else put files into it
before you actually commit the content of the project.

Just my $0.02...
Best regards,

---
  Miha Vitorovic
  Inženir v tehničnem področju
  Customer Support Engineer
   NIL Data Communications,  Tivolska cesta 48,  1000 Ljubljana,  Slovenia
   Phone +386 1 4746 500      Fax +386 1 4746 501     http://www.NIL.si
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org