Re: Possible merge bug...would like confirmation

On 2/19/07, Peters Joshua C <jcpeter@ilstu.edu> wrote:

> 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).

Josh,

  You should probably be deleting the tag and then recreating it.
Merging into it is unnecessary work.

  So, after updating trunk, you could do the following from a checkout
of the entire repository, assuming you want to keep the tagging
atomic:

svn rm tags/LATEST
svn cp trunk LATEST
svn ci -m 'Updated LATEST tag to include ...'

  Is there a reason you're not doing it that way?

  That said, I was unable to reproduce your problem when merging into
the tag instead. Here is the recipe I used (the revision 4 in the
merge is the version originally tagged):

REPO=file://$PWD/repo
svnadmin create repo
svn mkdir $REPO/trunk -m ''
svn mkdir $REPO/tags -m ''
svn mkdir $REPO/trunk/docs -m ''
svn co $REPO/trunk trunk
echo foo > trunk/docs/a.txt
svn add trunk/docs/a.txt
svn ci trunk -m ''
svn cp $REPO/trunk $REPO/tags/LATEST -m ''
svn rm trunk/docs
svn up trunk
svn ci trunk -m ''
svn mkdir trunk/docs
echo foo2 > trunk/docs/a.txt
svn add trunk/docs/a.txt
svn ci trunk -m ''
svn co $REPO/tags/LATEST
svn merge -r4:HEAD $REPO/trunk LATEST
svn ci LATEST -m ''
svn diff $REPO/tags/LATEST $REPO/trunk

Thank you,

Bob

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 22 23:52:16 2007