shelve problem on shelving directory with ignored file inside
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
Breezy |
Triaged
|
Medium
|
Unassigned |
Bug Description
I don't think it's win32-related problem.
If I have added directory with ignored file inside and I want to shelve this directory I've got
bzr: ERROR: Tree transform is malformed [('missing parent', 'new-1')]
C:\Temp\1>bzr st
added:
foo/bar/
foo/bar/spam
C:\Temp\1>cd foo/bar
C:\Temp\1\foo\bar>
C:\Temp\
C:\Temp\
C:\Temp\1>
C:\Temp\1>bzr st
added:
foo/bar/
foo/bar/spam
C:\Temp\1>bzr ignored
foo/bar/1.~ *~
C:\Temp\1>bzr shelve --all
Selected changes:
-D foo/bar/
-D foo/bar/spam
bzr: ERROR: Tree transform is malformed [('missing parent', 'new-1')]
After that empty shelve item created:
C:\Temp\1>bzr st
added:
foo/bar/
foo/bar/spam
C:\Temp\1>bzr shelve --list
1: <no message>
C:\Temp\1>bzr unshelve --dry-run
Using changes with id "1".
.bzr.log related to shelve --all:
0.235 bazaar version: 2.1.2
0.235 bzr arguments: [u'shelve', u'--all']
0.266 looking for plugins in C:\work\
0.454 looking for plugins in C:/Program Files/Bazaar/
0.485 encoding stdout as sys.stdout encoding 'cp866'
0.610 opening working tree 'C:/Temp/1'
[ 3020] 2010-07-30 18:18:49.203 INFO: Selected changes:
[ 3020] 2010-07-30 18:18:49.203 INFO: -D foo/bar/
[ 3020] 2010-07-30 18:18:49.203 INFO: -D foo/bar/spam
0.688 Traceback (most recent call last):
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\shelf.pyo", line 377, in shelve_changes
File "bzrlib\shelf.pyo", line 251, in transform
File "bzrlib\
File "bzrlib\
MalformedTransform: Tree transform is malformed [('missing parent', 'new-1')]
Related branches
- Martin Packman: Approve
-
Diff: 52 lines (+28/-0)1 file modifiedbreezy/tests/test_shelf.py (+28/-0)
description: | updated |
description: | updated |
tags: | added: shelf treetransform |
tags: | added: check-for-breezy |
I can confirm this also happens on Lucid with trunk.
[x]% bzr st
added:
foo/bar/
foo/bar/spam/
[x]% cd foo/bar
[bar]% echo "hello" > 1.~
[bar]% cd -
~/tmp/x
[x]% bzr st
added:
foo/bar/
foo/bar/spam/
[x]% bzr ignored
foo/bar/1.~ *~
[x]% bzr shelve --all
Selected changes:
-D foo/bar/
-D foo/bar/spam/
bzr: ERROR: Tree transform is malformed [('missing parent', 'new-1')]
[x]% bzr version --short
2.3.0dev1
[x]%