Hi there,<div><br></div><div>I am having a strange problem with svk smerge recently. I have two branches, both have a common branch as parent in their history.</div><div><br></div><div>I developed in both branches, always merging from the first branch (A) to the second branch (B). The second branch had a parallel development, as a experimental feature. To resume:</div>
<div><br></div><div> A (active dev branch) B (experimental feature)</div><div> --------------------------------------------------------------------------------------------------------</div>
<div> A always smerge'd B.</div><div> new commits on A svk smerge //branches/A //branches/B</div><div> - new commits on B</div>
<div> - new commits on B</div><div> new commits on A svk smerge //branches/A //branches/B</div><div> - new commits on B</div>
<meta charset="utf-8"><meta charset="utf-8"><meta charset="utf-8"><div> new commits on A svk smerge //branches/A //branches/B </div><div><br></div><div>The problem arrises when I try to make the inverse way: svk smerge //branches/B //branches/A: I got a lot of conflict notifications (a lot of not modified files get a D and U status) and at the end, a not so helpful "Transaction is out of date" appears.</div>
<div><br></div><div>As I have a lot of new files in B that doesn't exist in A, I need to preserve the dev history.</div><div><br></div><div><div>Transaction is out of date: Directory '//branches/B' is out of date</div>
<div>Please update checkout first.</div><div><br></div><div>"Please update checkout first" is not applicable and don't give any clue of what to do.</div><div><br></div><div>Does somebody have any clue?</div>
<div><br></div><div>Thanks.</div></div>