[Lazarus] 0.9.30 merges are not really merged???

Florian Klaempfl florian at freepascal.org
Wed Feb 2 13:20:19 CET 2011


Am 02.02.2011 12:37, schrieb Vincent Snijders:
> 
> The list of merged revision can be found in the svnmerge-integrated
> property of root of the branch.
> vincent at fpclin32:~/src/lazfixes$ svn propget svnmerge-integrated
> http://svn.freepascal.org/svn/lazarus/branches/fixes_0_9_30
> /trunk:1-28809,28812-28814,28816-28826,28828-28847,28853-28854,28861,28863-28875,28877,28905,28907,28910-28912,28923,28925-28927,28930,28935,28937,28941,28963-28964,28978-28980,28982,29005,29021,29025-29027,29031,29035-29036,29061-29062,29067,29081-29084,29094-29100,29104,29112,29136,29138,29140-29141,29146,29157,29159,29181,29192-29193,29237,29296,29299,29316

Or just use
svnmerge integrated
maybe with -l to get the logs
and -S if multiple branches are merged into the current one.




More information about the Lazarus mailing list