Sorry I’ve been unable to test this until now because I was unable to access the git repository to get the sources and the installers didn’t really help since I use Linux. I have loaded version 1.8.2 with the following result. 1. It correctly identifies my version 1.6 repository 2. It still fails to compare modified files to the current file in the repository (i.e. display changes) The issue with 2 is in svn.py in the function get_path_for_repo_file in the way it generates the file name for the repository base Line 75: path = path[len(self.root) + 1:] Line 76: Line 77: base, fname = os.path.split(path) Line 78: svn_path = os.path.join(base, “.svn”, “text-base”, fname, “.svn-base”) If my repository is in /home/ross_b/project/software and the file I am trying to compare is /home/ross_b/project/software/module/source.cpp then before line 75 executes path = /home/ross_b/project/software/module/source.cpp self.root = /home/ross_b/project/software after line 75 executes path = module/source.cpp after line 77 executes base = module fname = source.cpp after line 78 executes svn_path = module/.svn/text-base/source.cpp.svn-base At this point it tries to copy from svn_path to a temporary file but that doesn’t work because svn_path is not a valid path (since the CWD of meld is the place it was run from) I fix this locally by commenting out line 75 in this case before line 77 executes path = /home/ross_b/project/software/module/source.cpp after line 77 executes base = /home/ross_b/project/software/module fname = source.cpp after line 78 executes svn_path = /home/ross_b/project/software/module /.svn/text-base/source.cpp.svn-base Since svn_path now has the correct full path to the file this works. Sorry to be unable to reply sooner Cheers Ben __________________________________________________________________
Technical Specialist SCISYS UK Limited T: +44 (0)1249 466386 E: ben ross scisys co uk | www.scisys.co.uk From: Keegan Witt [mailto:keeganwitt gmail com] Sorry for the delay on this. I did want to make this available for people to play with. I was trying to figure out how I wanted to handle the installer versioning on this. What I've decided to do is mark the version as 1.8.2.0 and label the download (and the version in meldapp.py) as a preview. The final 1.8.2.0 release will have the same version number (will replace the preview files), and won't have the meldapp.py edit and preview download label. I think this is how I'll approach any 1.8 branch releases, just mark it as a preview for the next release version. Unless someone has a recommendation for something better. I'm a bit constrained by NSIS wanting the version to be only numbers and periods. The new binaries are now available in their usual place (https://code.google.com/p/meld-installer/downloads/list). -Keegan On Fri, Oct 11, 2013 at 11:05 PM, Kai Willadsen <kai willadsen gmail com> wrote: On 10 October 2013 01:52, Ben Ross <Ben Ross scisys co uk> wrote: > I jumped into the source tree that had been downloaded but when running Meld This has been filed as bug 709249 SCISYS UK Limited. Registered in England and Wales No. 4373530.
Registered Office: Methuen Park, Chippenham, Wiltshire SN14 0GB, UK.
Before printing, please think about the environment. |