reintegrate problem
From: Ruslan Sivak <russ_at_vshift.com>
Date: Wed, 04 Mar 2009 17:27:15 -0500
I think I've found another 1.5 bug related to reintegrate...
Some time ago we created a branch called v2. There were a lot of
Now I would like to fully catch up to the trunk. I follow the
$cd workingcopy
Merge tells me that there is a conflict which I choose to resolve
I fix the conflict, rerun the merge and it finishes successfully. So
I now commit these changes to v2, and switch to trunk.
Looking at the history, it seems like there is a somefolder/somefile.ext
I guess the merge code that did the merge from trunk saw that there was
Hopefully this gives enough information to reproduce the bug.
Russ
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.