The Shoes of the Fisherman's Wife Are Some Jive-Ass Slippers

tpot (at) frungy . org

rss

←2006→
Months
Jan FebMar
Apr May Jun
Jul Aug Sep
Oct Nov Dec

Sat, 11 Feb 2006

Merge command

Because I can never remember the command line for merging between Samba branches, here it is:

svn merge \
	svn+ssh://samba.org/data/svn/samba/branches/tmp/deryck-samba4-swat \
	svn+ssh://samba.org/data/svn/samba/branches/SAMBA_4_0 .
posted at: 11:20 | path: /software/samba | permanent link to this entry