final integrated file is
shown below.
a
d
b
c
d
z
The expected output for the second test as verified in perforce and git is
a
d
b
c
z
Hope now it clarifies the problem.
- Original Message -
From: Stefan Sperling
To: Arunmozhi
Cc: "users@subversion.apache.org"
Sent: Frida
7;d' appearing twice in the integrated file. Final
integrated file is shown below.
a
d
b
c
d
z
The expected output for the second test as verified in perforce and git is
a
d
b
c
z
Hope now it clarifies the problem.
From: Stefan Sperling
To: Arunmoz
I feel that the SVN branching and merging/integration algorithm is
flawed. However I am not sure if this is a known limitation of SVN. I
did 2 tests to compare SVN against Perforce/git. The intention of the test
is to see if a change done by a user at some point in time and taken to
multiple
