merge base woes

[Lalo Martins]

lalo:~/src/bzr/integration> bzr log --show-ids -r last:1..
------------------------------------------------------------
revno: 1195
revision-id: robertc at robertcollins.net-20050912143501-941cc76acb5be086
parent: robertc at robertcollins.net-20050909171225-71ee15d84f8ec8d1
parent: robertc at robertcollins.net-20050912123958-7982e808f291f439
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-09-13 00:35:02 +1000
message:
  merge up with HEAD and with test-fixes
lalo:~/src/bzr/integration> cd ../bzr-branchconstructor
lalo:~/src/bzr/bzr-branchconstructor> bzr log --show-ids -r last:1..
------------------------------------------------------------
revno: 1203
revision-id: lalo at exoweb.net-20050914052213-2aa5c1005959abdf
parent: lalo at exoweb.net-20050913095212-210555d61a893f1e
parent: robertc at robertcollins.net-20050912143501-941cc76acb5be086
committer: Lalo Martins <lalo at exoweb.net>
timestamp: Wed 2005-09-14 13:22:13 +0800
message:
  merging from Robert's integration branch
lalo:~/src/bzr/bzr-branchconstructor> bzr find-merge-base . ../integration
merge base is revision mbp at sourcefrog.net-20050905040803-332af983e14b1072


Really?  How so???
(predictably enough, trying to merge in either direction will give me a
lot of bogus conflicts)

best,
                                               Lalo Martins
--
      So many of our dreams at first seem impossible,
       then they seem improbable, and then, when we
       summon the will, they soon become inevitable.
--
http://www.exoweb.net/                  mailto:lalo at exoweb.net
GNU: never give up freedom                 http://www.gnu.org/