LinuxQuestions.org
Support LQ: Use code LQ3 and save $3 on Domain Registration
Go Back   LinuxQuestions.org > Forums > Linux Forums > Linux - Software
User Name
Password
Linux - Software This forum is for Software issues.
Having a problem installing a new program? Want to know which application is best for the job? Post your question in this forum.

Notices

Reply
 
Search this Thread
Old 03-07-2011, 12:27 PM   #1
sohmc
Member
 
Registered: Aug 2002
Location: Alexandria
Distribution: ubuntu 12.04.2
Posts: 217

Rep: Reputation: 30
Help "merging" two mercurial (hg) "branches"


Back before I properly knew how to use mercurial, is "branched" development on a solid state of code to create a new version. My way of doing this was to a directory copy of the directory:

Code:
$> cp -r ./hg-src ./hg-src-2.0
I've been working on 2.0 for a while, doing major code changes, etc. In the mean time, 1.0 had bugs that needed repairing. It was around this time I realize that I probably wasn't doing this right. So my hg-src structure looks something like this:

Code:
./hg-src/
  .hg/
  branches/
    1.1/
      .hg/
      somefile.php
      somefile2.php
      added_file2.php
  tags/
    1.0/
      somefile.php
      somefile2.php
  trunk/
    somefile.php
    somefile2.php


./hg-src-2.0/
  .hg/
  somefile.php
  somefile2.php
  brandnewlibrary.php
  binaryfile.jpg
Some history: I didn't put together the "branches, tags, trunk" directory structure until after.

What I'd like to do now is do a merge of hg-src and hg-src-2.0 but when I try, it says that the repository is unrelated.

Now, my guess is that if I do a merge ./hg-src/branches/1.1/ and ./hg-src-2.0/ that it will take.

Is there a way to merge all three of these branches into one directory and keep all of the history?

Thanks!
 
Old 03-09-2011, 12:58 AM   #2
EricTRA
Guru
 
Registered: May 2009
Location: Gibraltar, Gibraltar
Distribution: Fedora 20 with Awesome WM
Posts: 6,805
Blog Entries: 1

Rep: Reputation: 1290Reputation: 1290Reputation: 1290Reputation: 1290Reputation: 1290Reputation: 1290Reputation: 1290Reputation: 1290Reputation: 1290
Hello,

Maybe this one will help you: http://stackoverflow.com/questions/1...s-in-mercurial

Kind regards,

Eric
 
  


Reply

Tags
branch, hg, mercurial, svm


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
net working eth0 eth1 wlan0 "no connection" "no LAN" "no wi-fi" Cayitano Linux - Newbie 5 12-09-2007 07:11 PM
Standard commands give "-bash: open: command not found" even in "su -" and "su root" mibo12 Linux - General 4 11-11-2007 10:18 PM
LXer: Merging "Open Source" and "Free Software" LXer Syndicated Linux News 2 08-08-2007 04:27 AM
"Xlib: extension "XFree86-DRI" missing on display ":0.0"." zaps Linux - Games 9 05-14-2007 03:07 PM
LXer: Displaying "MyComputer", "Trash", "Network Servers" Icons On A GNOME Desktop LXer Syndicated Linux News 0 04-02-2007 08:31 AM


All times are GMT -5. The time now is 12:45 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