svn reintegrate causing merge conflicts
From: David Rothenberger <daveroth_at_acm.org>
Date: Fri, 22 Jan 2010 14:34:54 -0800
I am encountering an issue with "svn merge --reintegrate" when doing
The general scenario is:
The second merge will raise the file as a tree-conflict: "local add,
If a --record-only trunk-to-branch merge is done of the revision created
"svn merge ^/trunk ^/branch" for step #4 doesn't have this problem. (I
I see this behavior with both 1.6.6 and 1.6.9. Is this a bug?
I've attached a script that reproduces the scenario.
-- David Rothenberger ---- daveroth_at_acm.org "It takes all sorts of in & out-door schooling to get adapted to my kind of fooling" -- R. Frost
This is an archived mail posted to the Subversion Users mailing list.