On Sat, Dec 05, 2015 at 05:40:00PM +0900, Joel Rees wrote: > 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?
You can run 'sysmerge -d' which will force a full diff of everything. -- Antoine
