RE: [stellation-res] Proposal: audited checkins

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

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