[RFC] Workingstyle of different VCS systems

[Matthew Woehlke]

dukju ahn wrote:
> 2007/4/9, Andreas Pakulat <apaku at gmx.de>:
>> On 09.04.07 10:53:43, Matthew Woehlke wrote:
>>> Somehow "integrate" got left off the list, that one is important.
>> integrate? What was that again?
> 
> I guess that the integration he meant was creating new project
> by importing/checkout to/from remote repository.

No, "integrate" (at least in perforce terminology) means to take changes 
made to one file and apply them to another file (usually one with a 
common ancestor). It is literally 'make a patch, munge the file names, 
and apply it'. So for instances all those changes I've been making to 
KATE in branches/3.5 need to be "integrated" and merged into trunk. :-)

integrate = Tell the VCS what you are doing (in some VCS's this also 
adds metadata about the integration so you can see that such-and-such 
version is the previous version plus integrations from somewhere else, 
possibly with edits on top of that also). If we have branch, we need 
integrate.

merge = Resolve conflicts, either from an update of something you were 
editing, or from an integration (i.e. merge != integrate; merge is a 
100% client-side operation). If we have update and diff (of course we 
do), we need merge.

Some VCS's may do the "merge" step implicitly during an integrate or update.

> IMHO the integration would go to basic interface among the
> separate interfaces.

It should go wherever 'branch' is IMO, since if you can't branch, you 
have nothing to integrate.

-- 
Matthew
If you believe you received this e-mail in error, you are probably sadly 
mistaken, but if not, aren't you lucky?