Comments on: Hacking Django, how Bazaar http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/ Fri, 25 Jul 2008 11:02:54 +0000 http://wordpress.org/?v=MU By: Andrew http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1554 Andrew Sat, 13 Jan 2007 06:48:52 +0000 http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1554 Jonathan: the bzr-svn plugin works in a similar way. Jonathan: the bzr-svn plugin works in a similar way.

]]> By: Jonathan Rockway http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1530 Jonathan Rockway Fri, 12 Jan 2007 16:07:52 +0000 http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1530 Using bzr to work on a svn project seems like a bad idea. I would recommend using SVK, which will create a full local copy of the project's svn tree that you can branch and merge to with ease. It's smart enough to track merges so that you don't keep merging the same patch each time. It can also "push" to a patch instead of the upstream repository, so you can mail your changes to the developers if you don't have write access. There are also features like darcs-style interactive commits (but with a nicer interface), smart merging, views, and so on. Take a look: http://search.cpan.org/~clkao/SVK-v2.0.0/ Using bzr to work on a svn project seems like a bad idea. I would recommend using SVK, which will create a full local copy of the project’s svn tree that you can branch and merge to with ease. It’s smart enough to track merges so that you don’t keep merging the same patch each time. It can also “push” to a patch instead of the upstream repository, so you can mail your changes to the developers if you don’t have write access. There are also features like darcs-style interactive commits (but with a nicer interface), smart merging, views, and so on.

Take a look:

http://search.cpan.org/~clkao/SVK-v2.0.0/

]]> By: Gary http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1529 Gary Fri, 12 Jan 2007 16:06:53 +0000 http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1529 @Jeff: I haven't tried the <a href="http://bazaar-vcs.org/BzrForeignBranches/Subversion" rel="nofollow">bzr-svn plugin</a> yet, but it looks like it would make things even easier. Thanks! @Jeff: I haven’t tried the bzr-svn plugin yet, but it looks like it would make things even easier. Thanks!

]]> By: Gary http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1528 Gary Fri, 12 Jan 2007 16:02:17 +0000 http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1528 @Philipp: First svn update upstream: <code>cd upstream svn up </code> Then add/remove files to/from bzr repo that were added/removed in the svn update and commit changes to bzr repo: <code>bzr add <files_to_add> bzr ci </code> Now merge and commit the upstream changes to your branches: <code>cd in-and-empty-list-2473 bzr merge bzr ci </code> @Philipp:
First svn update upstream:
cd upstream
svn up

Then add/remove files to/from bzr repo that were added/removed in the svn update and commit changes to bzr repo:
bzr add <files_to_add>
bzr ci

Now merge and commit the upstream changes to your branches:
cd in-and-empty-list-2473
bzr merge
bzr ci

]]> By: vezult http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1527 vezult Fri, 12 Jan 2007 15:30:31 +0000 http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1527 @Noah: Check out Olive (gtk based) at http://bazaar-vcs.org/Olive @Noah: Check out Olive (gtk based) at http://bazaar-vcs.org/Olive

]]> By: Jeff Waugh http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1524 Jeff Waugh Fri, 12 Jan 2007 12:26:49 +0000 http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1524 Great stuff, but even better -- the bzr-svn plugin lets you dodge svn entirely. :-) Great stuff, but even better — the bzr-svn plugin lets you dodge svn entirely. :-)

]]> By: Philipp Keller http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1523 Philipp Keller Fri, 12 Jan 2007 12:25:24 +0000 http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1523 What do you then when the django trunk has changed? How do you merge the changes into your branch? Did I miss something? What do you then when the django trunk has changed? How do you merge the changes into your branch? Did I miss something?

]]> By: Noah http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1513 Noah Fri, 12 Jan 2007 04:17:57 +0000 http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1513 Thank you for introducing me to Bazaar. I will look into it further. Is there a GUI for it? Particularly for OS X? Thank you for introducing me to Bazaar. I will look into it further. Is there a GUI for it? Particularly for OS X?

]]> By: Paul http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1510 Paul Fri, 12 Jan 2007 01:02:39 +0000 http://gdub.wordpress.com/2007/01/11/hacking-django-how-bazaar/#comment-1510 Gary, thanks a lot for posting this. I've been struggling similarly with a couple projects for which I have my own tweaks and patches, Django being one of them. This may be the thing that finally gets me to try distributed source control. Gary, thanks a lot for posting this. I’ve been struggling similarly with a couple projects for which I have my own tweaks and patches, Django being one of them. This may be the thing that finally gets me to try distributed source control.

]]>