Mattias Engdegård wrote: > If a file has both text and property conflicts, only resolving one of them > leads > to an incorrect conflict summary message.
I'll take this one. There's a bunch of stuff to sort out, here; marking both conflicts as resolved at the same time is only one of the bugs. - Julian > Example: > > $ svnadmin create repo > $ svn co file://$PWD/repo d1 > $ svn co file://$PWD/repo d2 > $ cd d1 > $ echo a > f; svn add f; svn ps p x f > $ svn ci -m m > $ cd ../d2 > $ echo b > f; svn add f; svn ps p y f > $ svn up > Updating '.': > CC f > Updated to revision 1. > Conflict for property 'p' discovered on 'f'. > Trying to add new property 'p' > but the property already exists. > <<<<<<< (local property value) > y======= > x>>>>>>> (incoming property value) > > Select: (p) postpone, (mf) mine-full, (tf) theirs-full, (q) quit, > (h) help: p > Conflict discovered in file 'f'. > Select: (p) postpone, (df) diff-full, (e) edit, (m) merge, > (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: mc > Resolved conflicted state of 'f' > Summary of conflicts: > Text conflicts: 0 remaining (and 1 already resolved) > Property conflicts: 0 remaining (and 1 already resolved) > $ svn st > MC f > ? f.prej > Summary of conflicts: > Property conflicts: 1 >
