LinuxQuestions.org
LinuxAnswers - the LQ Linux tutorial section.
Go Back   LinuxQuestions.org > Forums > Non-*NIX Forums > Programming
User Name
Password
Programming This forum is for all programming questions.
The question does not have to be directly related to Linux and any language is fair game.

Notices

Reply
 
Search this Thread
Old 05-24-2012, 04:44 PM   #1
eantoranz
Senior Member
 
Registered: Apr 2003
Location: Colombia
Distribution: Kubuntu, Debian, Knoppix
Posts: 1,982
Blog Entries: 1

Rep: Reputation: 83
bzr - rebase of separate branches


Hi!

I have been working on a bzr branch on a project. Now, this branch has to be put into svn cause that's what people are using.

I have read that you can use bzr push in order to put a branch into one SVN repo but the problem is that I have to rebase what I did on an empty branch that has just been created (so, it has one "empty" commit in svn).

I did something like this. Assume the bzr branch is in directory bzr and the bzr checkout from the svn branch is in directory bzr-svn.

Code:
bzr branch bzr-svn test # create another branch to do the rewrite just in case
cd test
bzr merge -r 0..1 ../bzr # let's bring first revision of the project I want to put on top of the SVN branch so that rebase has one starting point
bzr commit -m "bring first revision of project to have one starting place"
bzr rebase ../bzr
This works almost perfectly, the problem is that what I end up having is a branch that looks like my project's bzr branch with the svn branch starting commit on top of it..... what I'd like to have is exactly this but with the svn commit at the bottom instead.
 
  


Reply

Tags
branches, bzr, bzr-svn, rebase, svn


Thread Tools Search this Thread
Search this Thread:

Advanced Search

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is Off
HTML code is Off


Similar Threads
Thread Thread Starter Forum Replies Last Post
bzr / precise - how to override plugins path for an alternate installation of bzr? eantoranz Linux - Software 0 05-09-2012 09:47 AM
LXer: Understanding git rebase Part II LXer Syndicated Linux News 0 09-07-2011 02:20 AM
LXer: Understanding git rebase LXer Syndicated Linux News 0 09-04-2011 02:42 AM
bzr-svn problem RudraB Linux - Software 1 01-20-2011 02:40 AM
bzr: Merging a project into another eantoranz Linux - Software 0 07-21-2008 10:24 AM


All times are GMT -5. The time now is 10:21 AM.

Main Menu
My LQ
Write for LQ
LinuxQuestions.org is looking for people interested in writing Editorials, Articles, Reviews, and more. If you'd like to contribute content, let us know.
Main Menu
Syndicate
RSS1  Latest Threads
RSS1  LQ News
Twitter: @linuxquestions
identi.ca: @linuxquestions
Facebook: linuxquestions Google+: linuxquestions
Open Source Consulting | Domain Registration