svn commit: samba r16027 - in branches/tmp: .
Gerald (Jerry) Carter
jerry at samba.org
Sun Jun 4 21:53:37 GMT 2006
-----BEGIN PGP SIGNED MESSAGE-----
> Do you know by chance if it is possible to use the
> same tree with svn and bzr at the same time?
> I would like to use bzr on my samba3 checkout so that
> I can commit local steps and when I am done just commit
> all changes up to our main svn branch, do you know if
> that is possible or is there any conflict if I
> use both bazar and svn on the same directory structure?
You could have a local mirror the SAMBA_3_0 tree
(bzr pull) and then merge to that tree from your
working area. This would give you a diff against the
current 3.0 tree. Although I just have a diff-script
with an extended --exclude-from file.
* jerry turns to audience...
I imagine that we will not change our SCM anytime soon.
I would be concerned about bottlenecks with the core
developers. The distributed central control of svn works
well for us I think. But bzr can offer some help in
code review and for developers without ssh keys.
The work flow I see is probably something like:
while (patch not done); do
bzr merge && review
diff samba3-bzr samba3-svn | ( cd samba3-svn && patch -p0)
We could save some of the history from the bzr tree
if we like but probably not ever individual commit msg.
Just the major comments that outline design and explain
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
-----END PGP SIGNATURE-----
More information about the samba-technical