How do I detect SVN 1.7 conflicts before SVN update?
Question
When using SVN 1.6 good old svn merge --dry-run --revision BASE:HEAD . would tell me.
Now with SVN 1.7 this merge won't work because the the WC is mixed revision (ie SVN update has not been run after commiting).
I want to know if any conflicts will occur before running the SVN update.
It seems a bit chicked and egg now.
Any ideas please?!
1 answers
solution1
0 ACCPTED 2013-09-22 12:16:46
Try the --allow-mixed-revisions flag, like this:
svn merge --dry-run --revision BASE:HEAD . --allow-mixed-revisions
This works for me, with Subversion 1.8.3.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.
Related Question
How do I make svn update prompt to resolve conflicts?
How do i schedule auto svn update in linux without conflicts?
How do I undo accidental svn update
SVN: How reliable are conflicts?
SVN - svn cleanup before every svn update
How conflicts are detected in SVN?
SVN update command to rediscover conflicts
How do you update SVN?
How do i go about resolving this svn merge error : svn merge aborted abnormally. resolve conflicts and continue?
Powershell: how can I check whether there is any conflicts occurred during the svn update
Related Tags