Hi,

Would you be able to provide the contents of `svn log -r 68147 -l 1 --xml`, as 
an attachment? That would help us to see what the problem is.

Christian

--  
Christian Hammond - christ...@beanbaginc.com  
Review Board - https://www.reviewboard.org  
Beanbag, Inc. - https://www.beanbaginc.com

-----Original Message-----
From: Ovidiu-Florin BOGDAN <ovidiu....@gmail.com>
Reply: reviewboard@googlegroups.com <reviewboard@googlegroups.com>>
Date: February 13, 2015 at 10:15:06 AM
To: reviewboard@googlegroups.com <reviewboard@googlegroups.com>>
Subject:  Issues with SVN branch diff

> Hello world,
>  
> We have the following scenario:
>  
> - Checkout form TRUNK
> - Copy to BRANCH/my/branch
> - switch Working directory to BRANCH/my/branch
> - make changes & commit to branch
> - sync with TRUNK (update and merge) on the branch
> - fix conflicts
> - generate diff
> - post to Review Board
> - get feedback
> - Update (update also RB)
> - Ship it!
> - merge BRANCH into TRUNK & commit
>  
> I'm having problems generating the diff using rbt.
> Generating it with *svn diff *I would do:
> svn diff ^/TRUNK/path/to/dir@68147 ^/BRANCH/my/branch@68238 > ~/Desktop/file  
> .diff
>  
> But when using *rbt post* (or *rbt diff*):
> rbt post -d 68147 68238
>  
> I get:
> >>> RBTools 0.7.1
> >>> Python 2.7.9 (default, Dec 11 2014, 04:42:00)
> [GCC 4.9.2]
> >>> Running on Linux-3.18.6-1-ARCH-x86_64-with-glibc2.2.5
> >>> Home = /home/me
> >>> Current directory = /home/me/WORK/path/to/branch/dir
> >>> Checking for a Subversion repository...
> >>> Running: svn info --non-interactive
> >>> Running: diff --version
> >>> repository info: Path: http://repo/svn, Base path: /BRANCH/my/branch,
> Supports changesets: False
> >>> Making HTTP GET request to http://server/reviews/api/
> >>> Running: svn log -r 68147 -l 1 --xml
> Traceback (most recent call last):
> File "/usr/bin/rbt", line 9, in  
> load_entry_point('RBTools==0.7.1', 'console_scripts', 'rbt')()
> File "/usr/lib/python2.7/site-packages/rbtools/commands/main.py", line 133  
> , in main
> command.run_from_argv([RB_MAIN, command_name] + args)
> File "/usr/lib/python2.7/site-packages/rbtools/commands/__init__.py",
> line 538, in run_from_argv
> exit_code = self.main(*args) or 0
> File "/usr/lib/python2.7/site-packages/rbtools/commands/diff.py", line 47,  
> in main
> revisions = tool.parse_revision_spec(args)
> File "/usr/lib/python2.7/site-packages/rbtools/clients/svn.py", line 156,
> in parse_revision_spec
> 'base': self._convert_symbolic_revision(revisions[0]),
> File "/usr/lib/python2.7/site-packages/rbtools/clients/svn.py", line 173,
> in _convert_symbolic_revision
> root = ElementTree.fromstring(log)
> File "/usr/lib/python2.7/xml/etree/ElementTree.py", line 1300, in XML
> parser.feed(text)
> File "/usr/lib/python2.7/xml/etree/ElementTree.py", line 1642, in feed
> self._raiseerror(v)
> File "/usr/lib/python2.7/xml/etree/ElementTree.py", line 1506, in
> _raiseerror
> raise err
> xml.etree.ElementTree.ParseError: syntax error: line 1, column 0
>  
> If I give it *--basedir ^/* or *--basedir /* it makes no difference.
>  
> It still runs *svn log -r 68147 -l 1 --xml* instead of *svn log ^/ -r 68147
> -l 1 --xml*.
>  
> Output of *svn log -r 68147 -l 1 --xml*:
> ------------------------------------------------------------------------  
>  
> Output of *svn log ^/-r 68147 -l 1 --xml*:
> ------------------------------------------------------------------------  
> r68147 | me | 2015-02-12 10:55:48 +0200 (Jo, 12 feb 2015) | 2 lines
>  
> Fixed makefile
>  
> ------------------------------------------------------------------------  
>  
> How can I fix this? Please help.
>  
> If I use the diff generated by *svn diff* it all works fine, using the web
> interface or providing the diff file to *rbt post*.
>  
> --
> Supercharge your Review Board with Power Pack: 
> https://www.reviewboard.org/powerpack/  
> Want us to host Review Board for you? Check out RBCommons: 
> https://rbcommons.com/
> Happy user? Let us know! https://www.reviewboard.org/users/
> ---
> You received this message because you are subscribed to the Google Groups 
> "reviewboard"  
> group.
> To unsubscribe from this group and stop receiving emails from it, send an 
> email to reviewboard+unsubscr...@googlegroups.com.  
> For more options, visit https://groups.google.com/d/optout.
>  

-- 
Supercharge your Review Board with Power Pack: 
https://www.reviewboard.org/powerpack/
Want us to host Review Board for you? Check out RBCommons: 
https://rbcommons.com/
Happy user? Let us know! https://www.reviewboard.org/users/
--- 
You received this message because you are subscribed to the Google Groups 
"reviewboard" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to reviewboard+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to