Hi, [email protected] (2011-09-08 at 1523.35 +1000): > How do you ignore it? > > I only see these options-- > > /dsk/data/src/blender/bmesh> svn merge -r39990:39991 > https://svn.blender.org/svnroot/bf-blender/trunk/blender > Conflict for property 'svn:mergeinfo' discovered on > 'release/scripts/startup/bl_ui/properties_data_bone.py'. > They want to delete the property, you want to change the value to > '/trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39990'. > Select: (p) postpone, > (mf) mine-full, (tf) theirs-full, > (s) show all options: s > > (e) edit - change merged file in an editor > (df) diff-full - show all changes made to merged file > (r) resolved - accept merged version of file > > (dc) display-conflict - show all conflicts (ignoring merged version) > (mc) mine-conflict - accept my version for all conflicts (same) > (tc) theirs-conflict - accept their version for all conflicts (same) > > (mf) mine-full - accept my version of entire file (even > non-conflicts) > (tf) theirs-full - accept their version of entire file (same) > > (p) postpone - mark the conflict to be resolved later > (l) launch - launch external tool to resolve conflict > (s) show all - show this list > > Select: (p) postpone, > (mf) mine-full, (tf) theirs-full, > (s) show all options:
Have you tried "tf"? Or postpone, svn propdel and svn resolved. You could even test the merge with --dry-run and manually change things you want to discard before really doing the real one. GSR _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
