From: Beman Dawes (bdawes_at_[hidden])
Date: 2001-09-25 15:03:25
At 03:36 PM 9/25/2001, David Abrahams wrote:
>Note that this procedure writes over the main trunk revision with the
>branch revision, without trying to merge. Maybe that's what you wanted;
>if so, fine.
Yes, that was the intent.
>I wonder how the repository got into this condition?
Me too. I looked at the history, and didn't see anything different from the
files that didn't have a problem. Take a look and see if you notice
anything. Seems like there is some state associated with each file that we
are not seeing, and somehow that state got the wrong value.
--Beman