[Monotone-devel] bug in changesets branch?

[Bruce Stephens]

I did this kind of thing (inadvertently).  In brief, I had the same
branch checked out twice, and committed changes on both.  In one I
added a directory and some files.  Merging worked (as expected), but
it seems update doesn't.  I'd have thought it should.  (I've stripped
out some output that I think is irrelevant.)

brs% mkdir one                                                          /tmp
brs% cd one                                                             /tmp
brs% touch a                                                        /tmp/one
brs% monotone --db=../a.db --branch=a add a                         /tmp/one
brs% monotone commit "test 1"                                       /tmp/one
monotone: committed revision aec89e590131e9943ea5cace1ca68a1ed1aad4c9
brs% cd ..                                                          /tmp/one
brs% monotone --db=a.db --branch=a co two                               /tmp
brs% cd two                                                             /tmp
brs% mkdir b                                                        /tmp/two
brs% touch b/c                                                      /tmp/two
brs% monotone add b                                                 /tmp/two
brs% monotone commit "test 2"                                       /tmp/two
monotone: committed revision 9702a0ff8cbfa36f8a175386c7585a9e8fbf48ff
brs% cd ../one                                                      /tmp/two
brs% touch e                                                        /tmp/one
brs% monotone add e                                                 /tmp/one
brs% monotone commit "test 3"                                       /tmp/one
monotone: committed revision f92be2b9429a3786be101d248e643f49423c1055
brs% monotone heads --branch=a                                      /tmp/one
monotone: branch 'a' is currently unmerged:
9702a0ff8cbfa36f8a175386c7585a9e8fbf48ff address@hidden 2004-10-28T16:20:45
f92be2b9429a3786be101d248e643f49423c1055 address@hidden 2004-10-28T16:21:06
brs% monotone merge --branch=a                                      /tmp/one
monotone: merging with revision 1 / 2: 9702a0ff8cbfa36f8a175386c7585a9e8fbf48ff 
<-> f92be2b9429a3786be101d248e643f49423c1055
monotone: common ancestor aec89e590131e9943ea5cace1ca68a1ed1aad4c9 found, 
trying 3-way merge
enter passphrase for key ID address@hidden:
monotone: [source] 9702a0ff8cbfa36f8a175386c7585a9e8fbf48ff
monotone: [source] f92be2b9429a3786be101d248e643f49423c1055
monotone: [merged] 1ffd0969c19258918c2a94db9bae1f669055d573
brs% monotone update                                                /tmp/one
monotone: selected update target 1ffd0969c19258918c2a94db9bae1f669055d573
monotone: moving b -> MT/tmp/3
monotone: misuse: rename source dir 'b' does not exist