equal
deleted
inserted
replaced
111 # informs mercurial of what appened |
111 # informs mercurial of what appened |
112 # current changeset (.) and previous one (.^) replace A (42) |
112 # current changeset (.) and previous one (.^) replace A (42) |
113 $ hg kill --new . --new .^ 42 |
113 $ hg kill --new . --new .^ 42 |
114 |
114 |
115 |
115 |
|
116 Update my current work in progess after a pull |
|
117 ---------------------------------------------- |
|
118 |
|
119 Whenever you are working on some changesets, it is more likely that a pull |
|
120 will, eventually, import new changesets in your tree. |
|
121 |
|
122 And it is likely that you will want your work in progress changsets to be |
|
123 rebased on the top of this newly imported subtree. |
|
124 |
|
125 Doing so is only a matter of rebasing. |
|
126 |
|
127 |
|
128 |
116 Move multiple changesets: ``rebase`` |
129 Move multiple changesets: ``rebase`` |
117 ------------------------------------------------------------ |
130 ------------------------------------------------------------ |
118 |
131 |
119 You can still use rebase to move a whole segment of the changeset graph together. |
132 You can still use rebase to move a whole segment of the changeset graph together. |
120 |
133 |