# HG changeset patch # User Oleksandr Gavenko # Date 1424729897 -7200 # Node ID 5493b5425eba4c4a440dc08035847cbee47cc37c # Parent da4a6ceb7e892b627d5789c49778dc79f5f4359e limit merge only to current branch diff -r da4a6ceb7e89 -r 5493b5425eba hg.rst --- a/hg.rst Fri Feb 13 11:30:28 2015 +0200 +++ b/hg.rst Tue Feb 24 00:18:17 2015 +0200 @@ -476,11 +476,15 @@ $ hg pull --rebase -Rebase draft (unpublished) changes over public changes:: +Rebase draft (unpublished) changes over public changes if one one head:: $ hg rebase -s 'draft()' -d 'public()' $ hg up # it possible that you isn't on a tip +If you want to limit merge only to current branch:: + + $ hg rebase -s 'draft() & branch(.)' -d 'public() & branch(.)' + Find greatest common ancestor of changesets. ============================================ ::