On 7/24/07, Jeff Green <jgreen@5d.ca> wrote:
>
> Hi all,
>
> My company has just recently migrated over to SVN and we are in the
> process of getting the repository up to date. As we've been checking in
> our code, we've been having some very weird behaviour with respect to
> file merges.
>
> For example, we had an xml file in the repository. It's initial check-in
> contained the text:
>
> <Key id="1100">Number of duplicate unit IDs exceeds allowed value.</Key>
> </Translation>
>
> Working off this base, another employee committed a change:
>
> <Key id="1100">Number of duplicate unit IDs exceeds allowed value.</Key>
> <Key id="1104">
> There are currently no transfers stored in the handheld to download</Key>
> </Translation>
>
> Also working off the base, I committed:
>
> <Key id="1100">Number of duplicate unit IDs exceeds allowed value.</Key>
> <Key id="1101">
> Two or more donors were found with the specified ID. Please contact your site administrator for assistance.
> </Key>
>
> <Key id="1102">
> Two or more devices were found with the specified ID. Please contact your site administrator for assistance.
> </Key>
> <Key id="1103">
> Two or more objects were found with the specified ID. Select either "Donor" or "Device" to refine the search.
> </Key>
> </Translation>
>
> When I tried to commit, I was warned of conflicts (appropriately) and
> then ran an update on the xml file. Subversion automerged the file
> and in the process over wrote the first commit and replaced it with
> my changes. As far as I've been able to figure out, this happened
> because SVN found similiarities between my co-worker's changes
> and my own and assumed that my change had been to simply
> modify the line that my co-worker had committed.
>
> This confuses me however, as my expectation would have been that
> SVN would see two lines that were both different from the base and
> would detect a conflict.
>
> So all that background aside, I'm wondering if anyone has any thoughts
> on what SVN actually did here and why it occurred. This has since
> happened with other files I've checked in as well, with SVN over-writing
> other committed code instead of finding a conflict between lines.
> Thank you,
> Jeff Green
>
Hi Jeff,
Do you think you can write down an exact series of edits, commands and
command outputs to reproduce this? If this can happen, we'll want to fix it
in Subversion, but having a reproduction recipe surely help a lot there.
bye,
Erik.
Received on Sun Jul 29 22:41:11 2007