Merge commits in branch of subversion repository crash on diffing
Bug #456908 reported by
Huw Giddens
This bug report is a duplicate of:
Bug #295611: NoSuchRevision in diff when a ghost introduced the modified text..
Edit
Remove
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar Subversion Plugin |
New
|
Undecided
|
Unassigned |
Bug Description
I've been using a workflow like:
bzr init-repo bzr-repo
bzr branch http://
bzr branch bzr-repo/trunk bzr-repo/feature
hack on bzr-repo/feature
cd bzr-repo/trunk
bzr merge ../feature
bzr push http://
Trying to run bzr diff either on the merge commit (via -c) or across it (-r before:X..X) from a separate bzr repository results in bzr crashing:
bzr: ERROR: bzrlib.
affects: | bzr → bzr-svn |
To post a comment you must log in.
Steps to reproduce: $PWD/svn- repository svn-sandbox $PWD/.. /svn-repository ) .bazaar/ svn-cache/ 8416993f- 88bb-4b5e- bf51-df751838e0 50. {svn-repository ,trunk} trunk && echo 'change from trunk' >> file && bzr ci -m 'change from trunk') reproduce/ bzr-repository/ trunk/ feature && echo 'change from feature' >> file && bzr ci -m 'change from feature') reproduce/ bzr-repository/ feature/ trunk && bzr merge ../feature && bzr ci -m 'merged feature branch') reproduce/ bzr-repository/ trunk/ trunk && echo 'subsequent change in trunk' >> file && bzr ci -m 'subsequent change in trunk' && bzr push file:// $PWD/.. /../svn- repository) reproduce/ bzr-repository/ trunk/ repository repository repository/ && bzr branch file:// $PWD/.. /svn-repository trunk-two) repository/ trunk-two && bzr diff -c 4)
[giddens@quills 501 ~]$ mkdir reproduce
[giddens@quills 502 ~]$ cd !$
cd reproduce
[giddens@quills 503 reproduce]$ svnadmin create svn-repository
[giddens@quills 504 reproduce]$ svn co file://
Checked out revision 0.
[giddens@quills 505 reproduce]$ (cd svn-sandbox && echo 'initial commit' > file && svn add file && svn ci -m 'initial commit')
A file
Adding file
Transmitting file data .
Committed revision 1.
[giddens@quills 506 reproduce]$ bzr init-repo bzr-repository
Shared repository with trees (format: 2a)
Location:
shared repository: bzr-repository
[giddens@quills 507 reproduce]$ (cd bzr-repository && bzr branch file://
Initialising Subversion metadata cache in /home/giddens/
Branched 2 revision(s).
[giddens@quills 508 reproduce]$ mv bzr-repository/
[giddens@quills 509 reproduce]$ (cd bzr-repository/
Committing to: /home/giddens/
modified file
Committed revision 3.
[giddens@quills 510 reproduce]$ (cd bzr-repository && bzr branch trunk feature)
Branched 3 revision(s).
[giddens@quills 511 reproduce]$ (cd bzr-repository/
Committing to: /home/giddens/
modified file
Committed revision 4.
[giddens@quills 512 reproduce]$ (cd bzr-repository/
M file
All changes applied successfully.
Committing to: /home/giddens/
modified file
Committed revision 4.
[giddens@quills 513 reproduce]$ (cd bzr-repository/
Committing to: /home/giddens/
modified file
Committed revision 5.
Pushed up to revision 5.
[giddens@quills 515 reproduce]$ bzr init-repo unrelated-
Shared repository with trees (format: 2a)
Location:
shared repository: unrelated-
[giddens@quills 517 reproduce]$ (cd unrelated-
Branched 5 revision(s).
[giddens@quills 519 reproduce]$ (cd unrelated-
==...