Unable to do merge without enabling the "ignore-ancestry" flag.

Hi All,

We are facing a weird issue with merging JAVA files. For some reason ,
when we do merge, SVN presumes that there is nothing to do, unless I
enable the "ignore-ancestry" flag.

*Here is what we did. *

1. Created branch "1.1" from "trunk".
2. Created branch "1.2" from "trunk".
3. Added file1.1.java to 1.1 branch.
4. Merged "1.1" branch to "1.2" branch.
5. Merged "1.1" branch to "trunk" with re-integrate option.
6. Merged "trunk" into "1.2" branch. (This is not merging the latest
JAVA file "file1.1.java" from trunk into branch unless
"ignore-ancestry" flag is set.

I tried to reproduce the issue by performing same steps on a short
repo, but surprisingly it works there.

SVN server version is 1.5.5 (r34862).

Any comments will be helpful .

Regards,
Vikram.
Received on 2011-03-21 20:37:38 CET