equal
deleted
inserted
replaced
474 |
474 |
475 SVN like update:: |
475 SVN like update:: |
476 |
476 |
477 $ hg pull --rebase |
477 $ hg pull --rebase |
478 |
478 |
479 Rebase draft (unpublished) changes over public changes:: |
479 Rebase draft (unpublished) changes over public changes if one one head:: |
480 |
480 |
481 $ hg rebase -s 'draft()' -d 'public()' |
481 $ hg rebase -s 'draft()' -d 'public()' |
482 $ hg up # it possible that you isn't on a tip |
482 $ hg up # it possible that you isn't on a tip |
|
483 |
|
484 If you want to limit merge only to current branch:: |
|
485 |
|
486 $ hg rebase -s 'draft() & branch(.)' -d 'public() & branch(.)' |
483 |
487 |
484 Find greatest common ancestor of changesets. |
488 Find greatest common ancestor of changesets. |
485 ============================================ |
489 ============================================ |
486 :: |
490 :: |
487 |
491 |