confused about rebase
Neal Becker
ndbecker2 at gmail.com
Sun Nov 21 16:37:02 CST 2010
I have boost_1_44_0.dist which is the upstream hg repo
I have boost_1_44_0.hg which is the upstream, with my patches added.
I updated to boost_1_45_0.dist by:
<extract tar file to new dir boost_1_45_0.dist>
cp -al boost_1_44_0.dist/.hg* boost_1_45_0.dist
cd boost_1_45_0.dist
hg addremove
hg ci
everything looks good - I have a boost_1_45_0.dist matching upstream
Now
cp -al boost_1_45_0.dist boost_1_45_0.hg
cd boost_1_45_0.hg
hg pull --rebase ../boost_1_44_0.hg <<< pull in my patches
pulling from ../boost_1_44_0.hg
searching for changes
adding changesets
adding manifests
adding file changes
added 18 changesets with 93 changes to 93 files (+1 heads)
nothing to rebase
Nothing to rebase?
More information about the Mercurial
mailing list