About a week ago, I was trying to get cvs up to current, and I tried to do
a sysmerge in my sleep after make build in src.

When I realized I wasn't awake enough to merge /etc/login.conf correctly, I
think I hit control-c.

Now sysmerge doesn't want to do anything at all.

Do I assume that login.conf was the last thing it needed to do? (And maybe
that I must have done something other than ctrl-c?)

Or can I just cvs up current now and hope that anything that might not have
gotten picked up last week gets picked up now, or do I need to do some
digging with mtree and/or some other tools?

Joel Rees

Computer memory is just fancy paper,
CPUs just fancy pens.
All is a stream of text
flowing from the past into the future.

Reply via email to