Re: Can I combine 'complete' and 'cherry-pick' merges?

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.
Received on 2016-03-15 22:05:22 CET