
Comment 1 by Stephen Leake, Jun 23, 2012
how is this different from the existing merge_into_workspace?

Comment 2 by Dirk Heinrichs, Jun 24, 2012
Hmm, didn't even know it existed. However, it takes a revision number, not a branch name, like propagate does.

Comment 3 by Stephen Leake, Jun 24, 2012
A branch name is just a way to specify a revision; it means the head revision of the branch. For a revision argument, you can use a selector to get the same thing: h:<branch>

Comment 4 by Stephen Leake, Jun 24, 2012
One difference is you don't get the conflict resolution machinery with merge_into_workspace.
Sign in to reply to this comment.
Reported by Dirk Heinrichs, Nov 11, 2011