[fpc-devel] Potential merge conflict in r15401

[Graeme Geldenhuys]

Op 2010-06-10 14:17, Jonas Maebe het geskryf:
> 
> And I don't know what "cherry picking" is. r14005 has to be reverted,  
> and then the entire branch should be brought up-to-date by merging

I take it you meant r15401. "cherry picking" is taking the same commit from
another branch and merge it into the current branch you are in. All the
original commit information (author, date, comment etc.) is transferred.
Now git log, merge, diff etc know where the new commit originated from and
will not conflict.

I looked in the SubVersion Red-Book doc and from that I think one can use
the standard 'svn merge -r' command, but I don't think SubVersion tracks
all the details like git. Anyway, it doesn't matter.

My knowledge of SubVersion has degraded rapidly. Could somebody with more
knowledge/confidence of SVN bring cpstrnew branch in sync with Trunk. I'll
hold off on further commits I have for cpstrnew branch until then.


> naming. There are no fixed rules for those things, but it is  
> recommended to keep things similar as the surrounding code (e.g., not  

OK, will do.



Regards,
  - Graeme -

-- 
fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal
http://opensoft.homeip.net/fpgui/