[cvsnt] WAS: merge error/feature when merging to branch and back

[Gerhard Fiedler]

Bo Berglund wrote:

> But at the same time there was a branch active started before the removal
> and when this branch was later merged to TRUNK the 3 files reappeared
> even though they had been removed! 
> 
> So I am also wondering about how this is supposed to work. 

IMO when a file exists on the branch that gets merged in but not on the
current branch, then it should get added. But if it did exist on the
current branch, had been removed and would get re-added, the add could
(should?) create some kind of conflict. Possibly get added and marked as
conflict.

Gerhard