probably bug? update in lightweight checkout of heavyweight checkout turns local commits into pending merges

Alexander Belchenko bialix at ukr.net
Mon Mar 17 16:01:52 GMT 2008


I don't know is it bug or feature, but I think it's the bug. At least this behavior
was very undesirable for me.

I did heavyweight checkout from server, then I did lightweight checkout from heavyweight checkout.
When I did local commit in heavyweight checkout and then update in lightweight one I get
pending merges in lightweight checkout (???) and uncommit (!!!) in heavyweight checkout.

I think something wrong here. You may think different.

Here is sequence of steps to reproduce (I ran this in C:\Temp\1 directory):

$ bzr init a
$ bzr mkdir a/foo
added a/foo
$ bzr ci a -m 1
Committing to: C:/Temp/1/a/
added foo
Committed revision 1.
$ bzr co a b
$ bzr co --lightweight b c
$ bzr info c
Lightweight checkout (format: dirstate or dirstate-tags or pack-0.92 or rich-root or rich-root-pack)
Location:
   light checkout root: c
         checkout root: b
    checkout of branch: a
$ bzr mkdir b/spam
added b/spam
$ bzr ci --local b -m 2
Committing to: C:/Temp/1/b/
added spam
Committed revision 2.
$ bzr up c
+N  spam/
All changes applied successfully.
Updated to revision 1.
Your local commits will now show as pending merges with 'bzr status', and can be committed with 'bzr commit'.
$ bzr st b
working tree is out of date, run 'bzr update'
$ bzr up b
-D  spam/
All changes applied successfully.
Updated to revision 1.
$ bzr st c
+N  spam/
P   Alexander Belchenko 2008-03-17 2
$ bzr st b
<no output>
$ bzr revno b
1
$ bzr ls b
b/foo



More information about the bazaar mailing list