rebase usability

[Pierre-Yves David]

On 11/28/2014 02:52 PM, anatoly techtonik wrote:
> On Tue, Nov 25, 2014 at 11:45 PM, Pierre-Yves David
> <pierre-yves.david at ens-lyon.org> wrote:
>> On 11/24/2014 10:50 PM, Ben Schmidt wrote:
>>>
>>> On 25/11/14 2:33 AM, anatoly techtonik wrote:
>>>>
>>>> I realize that I removed these lines, but I don't get where and why
>>>> there is conflict? Somebody added them or what? How to see the exact
>>>> changes that cause the conflict from each side?
>>>>
>>>> I'd like to see at clashing edits or at least revisions that are
>>>> clashing, but there is no such info. It is also quite hard to
>>>> understand what is dest and source - a more detailed explanation
>>>> `<<<<< common lines changed in destination revision XXX`, `>>>>>
>>>> common lines changed in revision YYY that is being rebased` would be
>>>> better.
>>
>>
>> You should have a look at the `ui.mergemarkers` option (set it to detailed)
>
> Thanks for the hint. Set those for the future conflicts.
>
>> IF you use rebase a lot I recommand using three way markers (or a graphical
>> tool).
>
> I tried graphical tools several ways and gave up. They all lack
> revision tree with an indication of conflicting revisions between
> branches. I'd prefer working on revision vs revision level that on big
> diffs with changes.
>
>>>> Right now I don't see other way than to cloning repo once more, switch
>>>> to dest branch, and run `hg blame` to see where these lines were
>>>> changes. Feel very ugly to me. Is there a better way?
>>>
>>> You definitely don't need to clone the repo again.
>>
>> +1 for "no need to re-clone" just run your command in the existing one.
>
> And how to run blame on a file from a HEAD of a different branch
> without re-cloning and switching?

hg help blame say:

    -r --rev REV             annotate the specified revision


So `hg blame --rev other-branch` should do the trick.

-- 
Pierre-Yves David