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

Pierre Asselin pa at panix.com
Mon Feb 2 21:11:34 CST 2009


Steve Borho <steve at borho.org> wrote:
> On Sat, Jan 31, 2009 at 9:29 AM, Pierre Asselin <pa at panix.com> wrote:
> >
> >    tar xjvf mvnforum-1.1.tar.bz2
> >    cd mvnforum-1.1
> >    ln -s /path/to/mvnforum-incoming/.hg .hg
> >    hg addremove --similarity 70
> >    hg commit --message 'MVNForum 1.1'

> You have to be careful about parent revisions when you do
> this.  After symlinking .hg, you should run 'hg parents' to be
> sure that it thinks you are commiting on top of the most recent
> release.  If that's not the case, you'll need to use debugsetparents
> to set it to the correct parent.

Good point, it never hurts to check.  However the workflow I propose
always leaves the repository at the most recent code drop.  The
"-incoming" repo is there only to be cloned or pulled from.

Should I describe my trick in the wiki, or is it too dangerous ?
I was looking for an equivalent to "cvs import".  It would be nice
to have parity with cvs :-)


-- 
pa at panix dot com



More information about the Mercurial mailing list