confused about rebase

Neal Becker ndbecker2 at gmail.com
Mon Nov 22 20:04:42 UTC 2010


Neal Becker wrote:

> Sorry, I'm still confused about how to setup this structure.  Lets say I
> have clean vendor tar balls, and a set of patches.  What are the steps I
> would use?

I think I got it.
1. Start with a clean hg repo of the vendor tree (boost_1_44_0.dist)
2. create vendor branch

[boost_1_44_0.dist]$ hg branch boost
marked working directory as branch boost

3. commit it

[nbecker at nbecker1 boost_1_44_0.dist]$ hg ci -m 'create boost vendor branch'

4. switch back to default branch

[nbecker at nbecker1 boost_1_44_0.dist]$ hg update default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

5. import each of my local patches to default
[nbecker at nbecker1 boost_1_44_0.dist]$ hg import -m 'BUILD' ../../diffs.BUILD 
applying ../../diffs.BUILD

Now updating vendor tree to 1.45.0:

6. tar xzf boost_1_45_0.tar.bz2

7. *** switch back to vendor branch!!

[nbecker at nbecker1 boost_1_44_0.dist]$ hg update boost

copy revision info on top of clean vendor tree
(Note we swiched to vendor branch in step 7 so we will be on
vendor branch here)

8. cp -al boost_1_44_0.dist/.hg* boost_1_45_0/

[nbecker at nbecker1 boost_1_45_0]$ hg branch
boost

9. addremove to update
[nbecker at nbecker1 boost_1_45_0]$ hg addremove

10. and commit
hg ci -m 'update to 1.45.0'

11. now merge
[nbecker at nbecker1 boost_1_45_0]$ hg update default
7076 files updated, 0 files merged, 1217 files removed, 0 files unresolved
[nbecker at nbecker1 boost_1_45_0]$ hg merge boost
note: possible conflict - tools/jam/src/boehm_gc/gc.mak was renamed multiple 
times to:
 tools/build/v2/engine/src/boehm_gc/NT_THREADS_MAKEFILE
 tools/build/v2/engine/src/boehm_gc/gc.mak
7196 files updated, 0 files merged, 1014 files removed, 0 files unresolved
(branch merge, don't forget to commit)

12. commit merge
[nbecker at nbecker1 boost_1_45_0]$ hg ci -m 'merge boost_1_45_0'

13. And it's just that easy :)
hg glog
@    changeset:   14:5992a4c2f2ff
|\   tag:         tip
| |  parent:      12:b10cec32b7ee
| |  parent:      13:f7d9aa607389
| |  user:        ndbecker2 at gmail.com
| |  date:        Mon Nov 22 14:44:42 2010 -0500
| |  summary:     merge boost_1_45_0
| |
| o  changeset:   13:f7d9aa607389
| |  branch:      boost
| |  parent:      4:0bb3b39d601b
| |  user:        ndbecker2 at gmail.com
| |  date:        Mon Nov 22 14:43:23 2010 -0500
| |  summary:     update to 1.45.0
| |
o |  changeset:   12:b10cec32b7ee
| |  user:        ndbecker2 at gmail.com
| |  date:        Mon Nov 22 14:40:02 2010 -0500
| |  summary:     vector
| |
o |  changeset:   11:14953cba1e71
| |  user:        ndbecker2 at gmail.com
| |  date:        Mon Nov 22 14:39:51 2010 -0500
| |  summary:     user-config
| |
o |  changeset:   10:b33b6e425477
| |  user:        ndbecker2 at gmail.com
| |  date:        Mon Nov 22 14:39:41 2010 -0500
| |  summary:     traits
| |
o |  changeset:   9:8cde359e627d
| |  user:        ndbecker2 at gmail.com
| |  date:        Mon Nov 22 14:39:30 2010 -0500
| |  summary:     multiarray
| |
o |  changeset:   8:dee4161e1eac
| |  user:        ndbecker2 at gmail.com
| |  date:        Mon Nov 22 14:39:21 2010 -0500
| |  summary:     mersenne
| |
o |  changeset:   7:173c9fc7f9e8
| |  user:        ndbecker2 at gmail.com
| |  date:        Mon Nov 22 14:39:10 2010 -0500
| |  summary:     hgignore
| |
o |  changeset:   6:227939b2cad8
| |  user:        ndbecker2 at gmail.com
| |  date:        Mon Nov 22 14:38:59 2010 -0500
| |  summary:     constrained
| |
o |  changeset:   5:f5c4c8f476ff
| |  parent:      3:aa67a6883458
| |  user:        ndbecker2 at gmail.com
| |  date:        Mon Nov 22 14:38:49 2010 -0500
| |  summary:     BUILD
| |
| o  changeset:   4:0bb3b39d601b
|/   branch:      boost
|    user:        ndbecker2 at gmail.com
|    date:        Mon Nov 22 14:35:12 2010 -0500
|    summary:     create boost vendor branch
|
o  changeset:   3:aa67a6883458
|  user:        ndbecker2 at gmail.com
|  date:        Fri Aug 13 19:46:05 2010 -0400
|  summary:     update to 1.44.0
|
o  changeset:   2:9f6bc3465b4f
|  user:        ndbecker2 at gmail.com
|  date:        Wed May 05 17:07:06 2010 -0400
|  summary:     update to 1.43.0
|
o  changeset:   1:b816579cd3f6
|  user:        ndbecker2 at gmail.com
|  date:        Wed Feb 24 19:41:40 2010 -0500
|  summary:     update to 1.42.0
|
o  changeset:   0:c6dde043ee33
   user:        ndbecker2 at gmail.com
   date:        Wed Nov 18 18:41:53 2009 -0500
   summary:     init 1.41.0





More information about the Mercurial mailing list