It is commited .... it says "commited revision 5" ... the problem is that you are trying to use two different "modes" of bzr interleaved with one another. You generally either do commit/update or push/merge/get but normally not both.
<br><br>Might want to read some bzr docs.<br><br><br>-Adam<br><br><div><span class="gmail_quote">On 7/30/07, <b class="gmail_sendername">Giuseppe Torelli</b> <<a href="mailto:colossus73@gmail.com">colossus73@gmail.com</a>
> wrote:</span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">Hi,<br><br>I have coded the gui of xhelp, the Xubuntu Documentation Browser.
<br>Unfortunately I'm having a bunch of errors when trying to committing<br>the code on bzr. Can someone please write me the detailed step on how<br>to commit code on bzr? It follows the output that is really<br>frustrating me (svn is really missing to me...):
<br><br>gt[xhelp]$ bzr push<br><a href="http://sftp://colossus73@bazaar.launchpad.net/~xubuntu-doc/xubuntu-documentation-browser/xhelp">sftp://colossus73@bazaar.launchpad.net/~xubuntu-doc/xubuntu-documentation-browser/xhelp
</a><br>Enter passphrase for key '/home/gt/.ssh/id_rsa':<br>bzr: ERROR: These branches have diverged. Try using "merge" and then<br>"push".<br>gt[xhelp]$ bzr merge<br>Merging from remembered location
<br><a href="http://sftp://colossus73@bazaar.launchpad.net/~xubuntu-doc/xubuntu-documentation-browser/xhelp/">sftp://colossus73@bazaar.launchpad.net/~xubuntu-doc/xubuntu-documentation-browser/xhelp/</a><br>Enter passphrase for key '/home/gt/.ssh/id_rsa':
<br>bzr: ERROR: Working tree has uncommitted changes.<br>gt[xhelp]$ bzr commit<br>modified Makefile<br>modified <a href="http://Makefile.in">Makefile.in</a><br>modified aclocal.m4<br>modified autom4te.cache/output.1<br>modified
autom4te.cache/requests<br>modified autom4te.cache/traces.1<br>modified config.log<br>modified config.status<br>modified configure<br>modified <a href="http://configure.in">configure.in</a><br>Committed revision 5.<br>gt[xhelp]$ bzr merge
<br>Merging from remembered location<br><a href="http://sftp://colossus73@bazaar.launchpad.net/~xubuntu-doc/xubuntu-documentation-browser/xhelp/">sftp://colossus73@bazaar.launchpad.net/~xubuntu-doc/xubuntu-documentation-browser/xhelp/
</a><br>Enter passphrase for key '/home/gt/.ssh/id_rsa':<br>bzr: ERROR: Branches have no common ancestor, and no merge base<br>revision was specified.<br>gt[xhelp]$<br><br>Thanks,<br><br>Thanks,<br>Giuseppe<br>--<br>
Colossus<br>Xarchiver, a Linux GTK+2 only archive manager - <a href="http://xarchiver.xfce.org">http://xarchiver.xfce.org</a><br><br>--<br>xubuntu-devel mailing list<br><a href="mailto:xubuntu-devel@lists.ubuntu.com">xubuntu-devel@lists.ubuntu.com
</a><br><a href="https://lists.ubuntu.com/mailman/listinfo/xubuntu-devel">https://lists.ubuntu.com/mailman/listinfo/xubuntu-devel</a><br></blockquote></div><br><br clear="all"><br>-- <br><a href="http://wiki.debian.org/AdamMiller">
http://wiki.debian.org/AdamMiller</a>