error in gnc-plugin-budget.c when compiling G2 from trunk

[David Hampton]

On Mon, 2005-11-21 at 09:17 -0500, Derek Atkins wrote:
> Quoting Tim Wunder <tim at thewunders.org>:
> 
> > Yep. I had changed it in order to get opening budgets to work 
> > properly. I rm'd
> > the local file and did another svn update and it compiles fine now.
> >
> > I thought changed local files are left alone during updates. Or is that a CVS
> > thing?
> 
> Nope, not a CVS thing, either...  If the same file is changed locally
> and in the repo, both SVN and CVS will form a conflict.  CVS might just
> be a little "better" about trying to merge "the same change".

CVS was definitely better at telling you there was a conflict.  With SVN
all you get is a single 'C' character, which looks a lot like the 'G'
character that means the two files were merged without any conflict.  In
a long list of changed files I often have to look twice to notice a
conflict.

David