[SVN-4522] On branch reintegrate also blocked revisions are merged but are not shown by merginfo eligible

• Type: Bug
• Status: Open
• Priority: Major
• Resolution: Unresolved
• Affects Version/s: 1.8.x
• Fix Version/s: ---
• Component/s: cmdline client
• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 06/Oct/14 17:34
• Updated: 07/Oct/14 09:02

Description

Hi,
I created a repository with a trunk folder and multiple branches. I merged branch one into trunk. Afterwards I deleted 
branch one. Then I merged branch one into branch two. Then I blocked this revision from merging into trunk. 
Unfortunately also my blocked revision was merged.

Here is the command line output to illustrate the problem:

$ svn merge -c 22 --record-only ^/branches/two
...
$ svn mergeinfo --show-revs eligible ^/branches/two@23 .
r16
r17
$ svn info
Pfad: .
Wurzelpfad der Arbeitskopie: /Users/manuel/Projects/trunk
URL: http://example.com/svn-training/trunk
Relative URL: ^/trunk
Basis des Projektarchivs: http://example.com/svn-training
UUID des Projektarchivs: 44182d07-42ff-4340-865f-398521477b97
Revision: 23
Knotentyp: Verzeichnis
Plan: normal
Letzter Autor: manuel.blechschmidt
Letzte geänderte Rev: 23
Letztes Änderungsdatum: 2014-10-06 17:52:47 +0200 (Mo, 06. Okt 2014)
$ svn diff -r 16:17 http://example.com/svn-training/
Index: branches/two/one-on-branch-two.txt
===================================================================
--- branches/two/one-on-branch-two.txt	(Revision 16)
+++ branches/two/one-on-branch-two.txt	(Revision 17)
@@ -1,4 +1,10 @@
 1
 2
 3
-4
\ No newline at end of file
+4
+5
+6
+7
+8
+9
+10
\ No newline at end of file
$ svn merge -v --reintegrate --dry-run ^/branches/two@23
-- Zusammenführen der Unterschiede zwischen Projektarchiv-URLs in ».«:
A    one-on-branch-two.txt
   C one-on-branch-one.txt
 G   .
Konfliktübersicht:
  Baumkonflikte: 1
$ svn propget svn:mergeinfo .
/branches/one:13-20
/branches/two:22
$ svn diff -c 22 ^/branches/two
Index: third.txt
===================================================================
--- third.txt	(Revision 0)
+++ third.txt	(Revision 22)
@@ -0,0 +1,10 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10

Eigenschaftsänderungen: third.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: one-on-branch-one.txt
===================================================================
Index: .
===================================================================
--- .	(Revision 21)
+++ .	(Revision 22)

Eigenschaftsänderungen: .
___________________________________________________________________
Added: svn:mergeinfo
   Zusammengeführt /trunk:r14-18
   Zusammengeführt /branches/one:r13-20

Why does the system try to create one-on-branch-one.txt?

I would expect that the system should run the following:

$  svn merge --dry-run -v -r 16:17 ^/branches/two@23
--- Zusammenführung
-- Zusammenführen von r17 in ».«:
   C one-on-branch-two.txt
Konfliktübersicht:
  Baumkonflikte: 1

I will also add my example repository.

/Manuel

Original issue reported by manuel_b

Issue Links

• depends upon: SVN-4255 Automatic merge ignores some cherry-picks, causing conflicts
• is blocked by: SVN-4255 Automatic merge ignores some cherry-picks, causing conflicts