Hi Eric,
Eric Dramstad <edrams <at> gmail.com> writes:
I'm thinking of doing this (while standing inside a trunk workarea):
svn merge ^/feature
svn merge -c -100 ./file.c
svn merge -c -101 ./file.h
svn commit -m 'reintegrated feature'
That should have been:
svn merge ^/feature
svn merge -c -100 ^/feature/file.c ./file.c
svn merge -c -101 ^/feature/file.h ./file.h
svn commit -m 'reintegrated feature'
I also should have mentioned that I'm using subversion 1.9.3.
Yes, this should be fine. We are using that approach quite regularly
here (though in our case the other way around --- aka: cherry picking
selective changes first and in the end do a complete merge of the rest).
--
Regards,
Stefan Hett
