Possible merge bug...would like confirmation
From: Peters Joshua C <jcpeter_at_ilstu.edu>
Date: 2007-02-19 19:08:18 CET
-----BEGIN PGP SIGNED MESSAGE-----
Hello all, I'm running into a fairly easily reproducable bug in subversion and would like some confirmation as to if it is already known/"feature" not a bug/etc. Forgive the length of this email, but I like to be as verbose as possible when reporting/receiving bug reports.
What is happening is as follows:
I do the following:
This results in two new revisions in the repo.
Later I want to tag my trunk as a milestone, say /tag/LATEST but I've already got a /tag/LATEST, so I merge the two together (ie. svn merge svn://repo/tag/LATEST svn://repo/trunk .) Dry run works fine, but the actual merge sometimes fails when the contents of a folder are seemingly unchanged. Subversion gives a out of date error and directs me to update my WC first, but updating does nothing and I cannot resolve this issue. Actually, that's not 100% true, as the issue is resolvable by merging with the first transaction, committing the change, and merging with the second transaction (and committing that change).
To look at it another way (for all of the visual learners here) we've got a repo with two folders initially
And I often get the following message:
Is this normal for Subversion? And if not, has this been reported?
Thanking you in advance.
This is an archived mail posted to the Subversion Users mailing list.