RE: [stellation-res] Proposal: audited checkins

["Mark C. Chu-Carroll" <mcc@xxxxxxxxxxxxxx>]

On Thu, 2003-01-23 at 20:20, Jonathan Gossage wrote:
> Is it possible to create a patch by multiple selecting a subset of the files
> that are potential candidates? 

I just tried it, and it looks like it works. So yes.



> This can be necessary, if for example, you
> start to do something and then discover that some refactoring is necessary
> before contining the new development. I am a firm believer in keeping
> refactoring and new work separate and therefore often find myself only
> wanting to check in a portion of the modified files in a project.

That's going to be a bit harder when you're using Stellation. None of
our current tools are capable of separating concurrent changes in a
single workspace. (My argument is, roughly, that this is an example
of why you want proper branches. You start a change, then realize
that you need to do some refactoring: checkin the change in progress
in your branch. Then do the refactoring, still in your branch. Then
push the changes upwards. If you're doing two distinct change tasks
at once, do it in two distinct workspaces, so that each change
stays atomic.)

One of the big questions, in terms of UIs, in just how to present 
branches properly in the Eclipse UI. There's no good way in the
current Eclipse GUI to express the notion of two workspaces (or views,
to use the clearcase term) open on the same project. I suspect we'll
want to add that.

	-Mark


> 
> Regards
> 
> Jonathan
> 
> 
> > >-----Original Message-----
> > >From: stellation-res-admin@xxxxxxxxxxxxxxx
> > >[mailto:stellation-res-admin@xxxxxxxxxxxxxxx]On Behalf Of Mark C.
> > >Chu-Carroll
> > >Sent: January 23, 2003 7:04 PM
> > >To: Stellation-res
> > >Subject: RE: [stellation-res] Proposal: audited checkins
> > >
> > >
> > >On Thu, 2003-01-23 at 18:51, Jonathan Gossage wrote:
> > >> OK. I have some stuff to check in but I will hold off until
> > >the new system
> > >> goes into effect.
> > >
> > >You're free to go ahead and do the checkin, since we haven't quite
> > >adopted this yet. You're also welcome to try out the patch stuff,
> > >and I describe it below, put it into a bugzilla entry, and forward it
> > >to me.  There's no reason to hold off a good change if it's ready.
> > >
> > >>  Could you please outline how patches work since I have
> > >> never dealt with them. If you are dealing with several
> > >modified files do you
> > >> create a single patch for everything? Also how is merging into
> > >the main-line
> > >> handled? One of the things that I like about Eclipse is that I
> > >can use the
> > >> visual merge capability to merge everything locally and thus avoid that
> > >> really horrid merge process where markers get inserted into
> > >source code. I
> > >> havn't had to deal with that type of technology for at least
> > >10 years now!
> > >
> > >
> > >Well, you're quite fortunate. Eclipse will do it in a way that looks
> > >very much like the synchronize GUI that you use to merge from CVS right
> > >now.
> > >
> > >If you go to the packages view, and go to the right mouse button on a
> > >project, under team, you'll see an option to create a patch for all
> > >changes in the project.
> > >
> > >To apply a patch, save it to your filesystem, and then from the
> > >right-mouse menu, select "Compare with patch". That will give you
> > >something like the familiar synchronize UI which you use to look at
> > >pieces of the patch, and apply them.
> > >
> > >	-Mark
> > >
> > >--
> > >Mark Craig Chu-Carroll,  IBM T.J. Watson Research Center
> > >*** The Stellation project: Advanced SCM for Collaboration
> > >***		http://www.eclipse.org/stellation
> > >*** Work: mcc@xxxxxxxxxxxxxx/Home: markcc@xxxxxxxxxxx
> > >
> > >
> > >_______________________________________________
> > >stellation-res mailing list
> > >stellation-res@xxxxxxxxxxxxxxx
> > >http://dev.eclipse.org/mailman/listinfo/stellation-res
> > >
> 
> 
> _______________________________________________
> stellation-res mailing list
> stellation-res@xxxxxxxxxxxxxxx
> http://dev.eclipse.org/mailman/listinfo/stellation-res
-- 
Mark Craig Chu-Carroll,  IBM T.J. Watson Research Center  
*** The Stellation project: Advanced SCM for Collaboration
***		http://www.eclipse.org/stellation
*** Work: mcc@xxxxxxxxxxxxxx/Home: markcc@xxxxxxxxxxx