[samba-soc] updates on bzr & requirements

Gerald (Jerry) Carter jerry at samba.org
Tue May 30 13:28:26 GMT 2006


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Gerald (Jerry) Carter wrote:

> I've fixed up my bzr mirroring scripts to include
> the commit messages from the svn trees.  I'll be posting
> updates bzr trees for SAMBA_3_0 and SAMBA_4_0 in the
> morning when the import finishes.  If you have already
> done a 'bzr branch' from the previous version, I think
> you can just do a 'bzr merge' from the new trees.
> Please spend a little bit on time once the new trees are
> up and play around.  Let me know if you have any problems
> so we can get the bzr issues straightened out early on.

My fault here.  You will not be able to 'bzr merge' from
the new trees.  I should have thought more about this.

$ bzr merge
Using saved branch: http://www.samba.org/~jerry/bzr/SAMBA_3_0.bzr/
bzr: ERROR: Branches have no common ancestor, and no base revision
specified.

So you will have to start a new branch from here.
I will try not recreate these branches again.





cheers, jerry
=====================================================================
Samba                                    ------- http://www.samba.org
Centeris                         -----------  http://www.centeris.com
"What man is a man who does not make the world better?"      --Balian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD8DBQFEfEh6IR7qMdg1EfYRAjJrAJ9hiGUvSthxfvalAZASaYuPj/Mo2ACggUHQ
gV+rv7kilRl7ipbNER5fY8Q=
=zZMg
-----END PGP SIGNATURE-----



More information about the samba-soc mailing list