Menu
How can you list all subversion merges?
For example:
Trunk ____9_____14____20___
\ \ \
\______\_____\____
Branch01 10 15 21
If I branched on rev 9, and then did a merge at rev 14. What is the subversion command line that identifies rev 15 as a merge from rev14 from trunk? The only way I can tell now is from the log file. However, I know I can issue the following command:
svn log –-stop-on-copy svn:<URL>/branches/Branch01
and it will stop on rev 10 (branched). Is there a command I can issue, that will list 21, 15, and 10 as copies from trunk?
488
Unlike svn diff, the merge command takes the ancestry of a file into consideration when performing a merge operation. This is very important when you're merging changes from one branch into another and you've renamed a file on one branch but not the other.
Sync merge is used when you want to fetch all of the latest changes made on your parent branch (e.g. trunk). Using this will keep your feature branch up-to-date with the parent branch.
You can use the svn plist command for this...
svn plist -v svn:mergeinfo URL/branches/Branch01
will print out the information about the branch
an other way is to use the --use-merge-history
svn log -v --use-merge-history URL/branches/Branch01
EDIT: The following seemed to me what you are searching for.
svn mergeinfo URL/trunk URL/branches/Branch01 --show-revs merged
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
