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

Re: (unknown)

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sun, 14 Feb 2016 14:34:42 +0000

Michal Matyl wrote on Thu, Feb 11, 2016 at 10:19:02 +0000:
> The example is about a simple branch merging with default settings and
> a classic conflict situation, no fancy features or complex
> trunk-to-branch back merging, so I belive simple prose description of
> the problem is enough.

The prose did not suffice: I would not have understood the problem
without the attachment. The preferred way to describe a bug is by
a script that reproduces it.

For future reference, we provide template scripts at:
https://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs
(fourth paragraph)

> First developer creates branch-01 and inserts few lines into existing
> file. Another developer creates branch-02 and makes exactly the same
> changes as first developer, i.e. inserts the same lines with the same
> content. The only difference in the second's developer branch is
> whitespace change (space/tab doesn't matter) in a line preceding
> inserted lines.
>

You are describing a merge where

* The difference between the OLD and MINE is:

    Index: branches/branch-01/test_file.txt
    ===================================================================
    --- branches/branch-01/test_file.txt (revision 3)
    +++ branches/branch-01/test_file.txt (revision 4)
    @@ -1,6 +1,9 @@
     A
     B
     C
    +D
    +E
    +F
     J
     K
     L
    \ No newline at end of file

* The difference between OLD and THEIRS is:

    Index: branches/branch-02/test_file.txt
    ===================================================================
    --- branches/branch-02/test_file.txt (revision 6)
    +++ branches/branch-02/test_file.txt (revision 7)
    @@ -1,6 +1,9 @@
     A
     B
    -C
    + C
    +D
    +E
    +F
     J
     K
     L
    \ No newline at end of file

* There are no local mods.

That merge results in:

    Index: trunk/test_file.txt
    ===================================================================
    --- trunk/test_file.txt (revision 7)
    +++ trunk/test_file.txt (revision 8)
    @@ -1,9 +1,12 @@
     A
     B
    -C
    + C
     D
     E
     F
    +D
    +E
    +F
     J
     K
     L
    \ No newline at end of file

Yes, I also think that is a bug: a text conflict should have been
flagged.

Could you please file an issue for this?

If you'd like to help fixing the bug, submitting a regression test (as
a patch against subversion/tests/cmdline/) would be a great first step.

I tested with 1.9.3.

Thanks,

Daniel
Received on 2016-02-14 15:34:44 CET

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