[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

reverse-merge fails to undo replacements

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 3 Jun 2014 16:14:19 +0200

This problem can be seen in a public repository.
Paths which were replaced are not reverse-merged.
Is this intended behaviour or a bug?

svn co svn://svn.twistedmatrix.com/svn/Twisted/trunk_at_42758 wc
cd wc

$ svn merge -c -42758 .
--- Reverse-merging r42758 into '.':
D twisted/topfiles/6750.feature
$ svn log -r42758
r42758 | wsanchez | 2014-06-03 07:25:58 +0200 (Tue, 03 Jun 2014) | 8 lines
Changed paths:
   R /trunk/docs/core/howto/listings/logger (from /branches/log-booyah-6750-4/docs/core/howto/listings/logger:42757)
   R /trunk/docs/core/howto/logger.rst (from /branches/log-booyah-6750-4/docs/core/howto/logger.rst:42757)
   R /trunk/twisted/python/_tzhelper.py (from /branches/log-booyah-6750-4/twisted/python/_tzhelper.py:42757)
   R /trunk/twisted/python/logger (from /branches/log-booyah-6750-4/twisted/python/logger:42757)
   R /trunk/twisted/python/test/test_tzhelper.py (from /branches/log-booyah-6750-4/twisted/python/test/test_tzhelper.py:42757)
   A /trunk/twisted/topfiles/6750.feature (from /branches/log-booyah-6750-4/twisted/topfiles/6750.feature:42757)

Merge log-booyah-6750-4: New logging system.

Author: wsanchez, glyph
Reviewer: ralphm
Fixes: #6750

New logging system: twisted.python.logger

Received on 2014-06-03 16:14:55 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.