FreeBSD project and subversion.

2013-01-31 Thread Alfred Perlstein
FreeBSD has moved to Subversion a few years ago and it's worked very, very well for us. The one area where we are having issues is merging code from project branches back into trunk. The typical workflow is: 1) create project branch. 2) code code code. 3) sync from HEAD (this works grea

Re: FreeBSD project and subversion.

2013-02-01 Thread Alfred Perlstein
On 1/31/13 12:08 PM, Stefan Sperling wrote: On Thu, Jan 31, 2013 at 10:37:14AM -0500, Alfred Perlstein wrote: FreeBSD has moved to Subversion a few years ago and it's worked very, very well for us. Thanks! That's encouraging to hear. The one area where we are having issues is me

PATCH: keyword expansion 1.8

2013-02-09 Thread Alfred Perlstein
ve me some things to try to ensure that it works properly. -Alfred On 2/1/13 7:40 AM, Alfred Perlstein wrote: [[ bringing in Lev Serebryakov, FreeBSD port maintainer for Subversion ]] Hello Lev, Stefan of the Subversion project asked me about bringing in our keywords patch for subversio

Re: How to display the code in my branch without merge changes?

2013-10-15 Thread Alfred Perlstein
ck to. thanks, Gabriela If you are fully up to date with merges, then you should just be able to diff against trunk.That should show you the differences between your branch and the trunk (net changes). -- Alfred Perlstein