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

[doahh]

Thanks for the reply Arne. I tried Steve's way first and it seemed to work OK
for me.

I was a little confused with the way you suggested to do it. After
committing mvnforum-1.1 and mvnforum 1.2 to the same repo you suggested that
I then pull from myapp. Would the two repos not have different parents and
therefore the pull would just overwrite any changes in myapp without giving
me the option to merge? I guess the answer is not really important as I
think Steve's version worked for me but I am curious if the way you
suggested would work and how - I think I don't understand something.


Arne Babenhauserheide-2 wrote:
> 
> Am Donnerstag 29 Januar 2009 16:33:40 schrieb doahh:
>> 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 assume that you want the updates, so why don't you just create an empty 
> repository, then first get the previous version (without the fix) and
> commit 
> that. Afterwards get the new version and commit that. 
> 
> Then just pull in the repo onto myapp, merge the old version (always
> choosing 
> your changed version) and afterward merge the new version with the fix. 
> 
> Does that work for you? 
> 
> Best wishes, 
> Arne
> -- 
> -- Ein Würfel System: http://1w6.org - einfach saubere (Rollenspiel-)
> Regeln.
> -- Infinite Hands: http://infinite-hands.draketo.de - singing a part of
> the 
> history of free software.
> -- My stuff: http://draketo.de - stories, songs, poems, programs and stuff
> :)
> 
> -- PGP/GnuPG: http://draketo.de/inhalt/ich/pubkey.txt
> 
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
> 
> 

-- 
View this message in context: http://www.nabble.com/Merging-3rd-party-updates-which-are-not-in-a-repository-into-my-repository-tp21729193p21733808.html
Sent from the Mercurial mailing list archive at Nabble.com.