[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] fix for interactive merge-callback not supporting spaces in file paths

From: Augie Fackler <durin42_at_gmail.com>
Date: 2007-07-11 22:54:56 CEST

Greetings all,

The attached patch fixes a bug in the interactive merge callback so
that it can handle files with shell-unsafe characters safely. I
discovered this when doing merges for Adium and got a conflict in a
file at the path 'Plugins/Dual Window Interface/
AIMessageWindowController.h' which opened my editor on 'Plugins/Dual'
rather than the appropriate temporary file inside .svn. With this
patch, everything works as expected.

Thanks,
Augie Fackler

[[[
Fix issue #2816: Interactive Merge Callback Handles Paths Safely

* subversion/svn/util.c
   (svn_cl__edit_file_externally) Change to the directory containing the
   temporary file and edit from there, then change back to the user's
working
   directory.
]]]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

  • application/octet-stream attachment: 2816.diff
Received on Wed Jul 11 22:54:27 2007

This is an archived mail posted to the Subversion Dev mailing list.