I ran an svn merge between my branch and svn trunk:
cd ~/mylocal/branch
svn merge -r1234:5678 svn+ssh://server/trunk .
There were alotof changes in the main trunk to be merged into my branch and several conflicts which i simply postponed. (p)
Then, when I needed to resolve te conflicts at a later time, I wanted to see only the name of the files with conflicts. The commandline one liner below grepped it:
cd ~/mylocal/branch
svn merge -r1234:5678 svn+ssh://server/trunk .
There were alotof changes in the main trunk to be merged into my branch and several conflicts which i simply postponed. (p)
Then, when I needed to resolve te conflicts at a later time, I wanted to see only the name of the files with conflicts. The commandline one liner below grepped it:
svn status | grep -P '^(?=.{0,6}C)'
No comments:
Post a Comment