Merging 3rd party updates which are not in a repository into my repository

Steve Borho steve at borho.org
Thu Jan 29 16:23:04 UTC 2009


On Thu, Jan 29, 2009 at 9:33 AM, doahh <gavin at prodia.co.uk> wrote:
>
> I have a problem that I can't quite get my head around.
>
> I have a web application that uses a MVNForum. My app uses mvnforum 1.1 and
> I have made modifications to it in order for it to have tighter integration
> with my app. MVNForum has now had a bug fix/security/upgrade release that I
> would like to merge into my app. Currently my forum project contains only
> the files from mvnforum that I have modified.
>
> I have tried a couple of ways of merging the new mvnforum release into my
> app but will describe the one that seems the most intelligent.

You need to give mercurial a better idea of the actual history:

tar xf mvnforum-1.1.tar
cd mvnforum-1.1
hg init
hg addremove
hg commit -m"1.1 release"  #revision 0
hg tag 1.1

# make modifications
hg branch localmods
hg commit -m"My mods"  #revisions 1..N

# mvnforum 1.2.1 released
hg update 1.1
tar xf mvnforum-1.2.1.tar
hg addremove -s 90
hg commit -m"1.2.1 release"

# Merge my modifications
hg merge localmods
hg commit -m"merged with 1.2.1"

--
Steve



More information about the Mercurial mailing list