Hello,
while playing around with some examples for the svn merge command, I
noticed that svn:mergeinfo gets modified even when the option
--ignore-ancestry is used. Here's an example:
-----
trunk> svn update
Revision 29.
trunk> svn propget svn:mergeinfo .
/branches/RB-1.0.0:18-28
/tags/PREP-1.0.0:17
trunk> svn merge --ignore-ancestry
svn://localhost/e2etrace/tags/PREP-1.0.0
svn://localhost/e2etrace/branches/RB-1.0.0
-- Zusammenführen der Unterschiede zwischen Projektarchiv-URLs in ».«:
U src\java\e2etrace\timer\DefaultTimer.java
Konflikt in »src/java/e2etrace/timer/ITimer.java« entdeckt.
Auswahl: (p) zurückstellen, (mf) volle eigene Datei, (tf) volle fremde
Datei,
(h) Hilfe für weitere Optionen: p
C src\java\e2etrace\timer\ITimer.java
U src\java\e2etrace\trace\ITraceStep.java
A src\java\e2etrace\trace\ITraceStepFactory.java
Überspringe »src\junit\e2etrace\timer«
A src\junit\e2etrace\timer\DefaultTimerTest.java
G .
trunk> svn propget svn:mergeinfo .
/branches/RB-1.0.0:18-28
/tags/PREP-1.0.0:17
/trunk:27
-----
As you can see, the merge added /trunk:27 to svn:mergeinfo. AFAIK,
self-referential mergeinfo is nothing that should happen anyway. And
according to the docs, until a new option --no-record is introduced,
--ignore-ancestry should prevent Subversion from using or modifying
svn:mergeinfo.
Has anybody else seen something like this? Is this considered a bug?
Thanks,
Gunther
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=987317
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-19 11:03:52 CET