search

gco / rietveld

Automatically exported from code.google.com/p/rietveld
Apache License 2.0
0 stars 0 forks source link

upload.py fails with external diff-cmd for svn #217

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago 
What steps will reproduce the problem?
1. Configure external graphical diff-cmd like like p4merge, meld or winmerge 
for svn in "config" file as described at 
http://svnbook.red-bean.com/en/1.5/svn.advanced.externaldifftools.html
2. Run "svn diff" to ensure your graphical tool is invoked
3. Run "upload.py"

What is the expected output? What do you see instead?
No output, had to interrupt the script. Data that never showed up after 
graphical tool exited.

% python review.py
The following files are not added to version control:
?      glossaries.diff
?      test/TEX/~variant_dir_dup0.py
Are you sure to continue?(y/N) y
^C
Interrupted.
%

I couldn't find a way how to force Subversion use internal diff implementation. 
The only way I see is to point it to an empty config dir.

Original issue reported on code.google.com by techtonik@gmail.com on 24 Aug 2010 at 7:06

GoogleCodeExporter commented 9 years ago 
Martin Furter from Subversion development ML confirmed that the only way in SVN 
1.6 is to supply different config dir. 
http://svn.haxx.se/dev/archive-2010-08/0607.shtml

Empty dir specified may produce more trouble, as config files may contain some 
global  user options that affect "svn diff" behavior.

An ideal solution looks like:
1. Reading config file to detect if external SVN is configured
2. Determine SVN version
3.1  Add --internal-diff option for SVN >= 1.7
3.2  Copying config dir with commented "diff-cmd" for SVN < 1.6

An alternative (temporary) solution is to add this issue to KnownBugs page and 
propose `python upload.py -- --config-dir=no-such-dir-hack` workaround.

Original comment by techtonik@gmail.com on 24 Aug 2010 at 11:42

GoogleCodeExporter commented 9 years ago 
Issue 308 has been merged into this issue.

Original comment by albrecht.andi on 12 Jun 2011 at 6:19

GoogleCodeExporter commented 9 years ago 
Related Subversion issue: 
http://subversion.tigris.org/issues/show_bug.cgi?id=3071

Subversion >= 1.7 will provide a --force-internal-diff flag (see 
http://svn.apache.org/repos/asf/subversion/trunk/CHANGES).

Attached is a proposed patch, but let's get back to this when Subversion 1.7 is 
out.

Original comment by albrecht.andi on 12 Jun 2011 at 6:22

Attachments:

GoogleCodeExporter commented 9 years ago

Original comment by albrecht.andi on 6 Apr 2012 at 6:14