Graeme Geldenhuys schrieb: > On 11/5/08, Florian Klaempfl <[EMAIL PROTECTED]> wrote: >> > Git for our company repositories. In SubVersion, branching is like an >> > afterthought. Manually having to track merges to a branch (though >> > apparently there was been some work towards this), etc... >> >> >> This is not true. svnmerge works very well for years for FPC. > > I have never heard of svnmerge. It's not on my Ubuntu system either, > and I have svn installed - so I gather it's not a standard SubVersion > tool.
# svnmerge The program 'svnmerge' is currently not installed. You can install it by typing: apt-get install subversion-tools -bash: svnmerge: command not found > Could you tell me more about this? It does merge tracking for you. We use it for years to track merged changes to the fixes branches. > Is it something the FPC team > created for FPC? Where can I get it and can you give a possible usage > example? http://www.orcaware.com/svn/wiki/Svnmerge.py _______________________________________________ Lazarus mailing list [email protected] http://www.lazarus.freepascal.org/mailman/listinfo/lazarus
