Bazaar Subversion Plugin

working on bzr'ed svn without bzr branches

Asked by szczepiq

I'm really interested in bzr-svn - thanks for sharing & developing this plugin!!!

My question is: Is it possible to work with svn repository in this way:

I create a bazaar repo out of a svn trunk. Then I can do local committs in my bzr repo. When I want to push changes I simply push them to svn repo. When I need to get latest changes from svn repo I simply pull them.

So far I tried approach presented here: http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#bzr-svn

It's basically creating bazaar repo from svn trunk but then I have to maintain a branch for my development which feels redundant. I'm sure there were plenty of reasons behind it but can I work with bzr-svn without bzr branches?

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Subversion Plugin Edit question
Assignee:
No assignee Edit question
Solved by:
Christian Faulhammer
Solved:
Last query:
Last reply:
Revision history for this message
szczepiq (szczepiq) said : 		#1

One more thing, following the instructions from the docs (using branch, then merging to 'trunk') has one more drawback. All commits made to the branch are flattened to one big commit when I actually commit the trunk to svn repo.

Revision history for this message
Best Christian Faulhammer (fauli) said : 		#2

Doing a simple bzr clone <repo-url> should do what you want. Branching is not needed.

Revision history for this message
Jelmer Vernooij (jelmer) said : 		#3

Wrt the revisions showing up as one big commit: bzr-svn only pushes the mainline history, since svn doesn't have a concept of merged revisions. The only commit on the mainline if you use "bzr merge" is the merge commit.

If you want to have all commits be pushed to svn, use rebase rather than merge.

Revision history for this message
szczepiq (szczepiq) said : 		#4

Thanks Christian Faulhammer, that solved my question.