Re: merging bug?

Max Bowsher wrote:
> Can you replicate the problem, and send the .svn/entries file from a
> directory containing one of the problem files to this list?

Well, I'm not thrilled about trying to put my primary
repository/working copies back in a non-functioning state.

I just tried making a simple test repository and doing the same
operations (make a branch, modify the trunk in a way that adds
files, merge, modify the branch, commit), and this did not duplicate
the problem (the commit worked). There were a few differences: the
code directories were simpler, this was the first merge/commit cycle
(it was the third or fourth in the real case I reported), only one
file was added, and I did all the operations on my workstation
(Fedora core 2 Linux- in the problem case I did the branch
merge/modify/commit from a Windows XP box).

I'll try a bit more to reproduce the problem in a test case, but I
don't have much free time to spend on it. If I can't, I'll just wait
and see. If it happens again with the real code I'll copy the .svn
directories before I try to fix things, and send the entries file here.

-- 
Graham Cummins, gic@cns.montana.edu, 406-581-8036
**************************************************
Only in a small moment do the cliffs seem more constant than the waves.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org