qdiff freezing on a single revision

[Lukáš Lalinský]

On Pi, 2008-03-21 at 17:31 +0100, Joseph Wakeling wrote:
> Hello all,
> 
> I'm having a problem with the qbzr command bzr qlog.
> 
> I recently merged in a revision from a friend's branch on a mutual
> project.  The merged-in revision deletes quite a large number of files
> and modifies a few others.
> 
> When I attempted to run bzr qdiff after the merge, the command seemed
> just to hang---no window opened, nor could I ctrl-C kill it.
> 
> bzr diff or cdiff worked fine, and seeing nothing wrong with the
> changes, I committed them.
> 
> Now, if I run bzr qlog, and attempt to view the qdiff of this revision,
> it again hangs.  Looking at the qdiff of any other revision prior or
> subsequent to the merge works fine.
> 
> I'm unsure if this is a duplicate of bug 174964:
> https://bugs.launchpad.net/qbzr/+bug/174964
> 
> ... or whether it's something different.  I note that it's a quite small
> tree I'm working with, it's a new project with few revisions (the merge
> was no. 17, the merged revision 15.1.1) and about 140 files.
> 
> Can anyone advise?

The qdiff view is really really unoptimized when it comes to showing big
merge diffs and added/deleted files are specifically problematic. So
it's mostly likely the same problem as #174964. 

Lukas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Toto je =?ISO-8859-1?Q?digit=E1lne?=
	=?ISO-8859-1?Q?_podp=EDsan=E1?= =?UTF-8?Q?_=C4=8Das=C5=A5?=
	=?ISO-8859-1?Q?_spr=E1vy?=
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080321/69489f37/attachment.pgp