[svk-devel] svk:merge out of control

[Michael Brouwer]

We ran into something like this here and it turned out to be due to a broken
YAML::Syck.  Below is a quote from my colleague about this.

YAML::Syck 0.84 is broken.  0.82 works like everyone expects.  0.85
works okay going both ways, but is slightly different from how 0.82
stores it on disk, so you don't want uncommitted smerges hanging
out when you upgrade/downgrade.


Michael


On 6/12/07, Michael Peters <mpeters at plusthree.com> wrote:
>
> My co-workers have been complaining and I've started to get annoyed by it
> to.
> Today I committed a 1 line change that resulting in a 83k email because
> the
> svk-merge property is getting out of control.
>
> I've done some merging between some branches recently, but it seems to be
> getting worse with each commit, whether it's a merge or not.
>
> Any ideas about how this happened? Any more ideas about how to fix it?
>
> Here's an example from the email:
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.bestpractical.com/pipermail/svk-devel/attachments/20070622/91b75bca/attachment.htm