On Sun, Jun 20, 2010 at 12:06:44PM +0300, Abby Kehat wrote:
> Hi -
>
> I was trying to merge modifications from a branch into a working copy. I had
> a few tree conflicts, and when I tried to resolve them, whether requesting to
> keep the directory from the repository or marking the conflict as
On Mon, Jun 14, 2010 at 4:35 AM, Cooke, Mark wrote:
>> -Original Message-
>> From: scarle...@gmail.com
>> Sent: 14 June 2010 01:19
>> Subject: Rectifying a foobar split/merger
>>
>> I have foobared the branch and cannot merge it anymore. The
>> main trunk is the next release; the branch (
Hi -
I was trying to merge modifications from a branch into a working copy. I had a
few tree conflicts, and when I tried to resolve them, whether requesting to
keep the directory from the repository or marking the conflict as resolved, I
got the following exception:
Subversion encountered a se
I there a tool that i can use to benchmark apache-subversion performance?
