Issue 447: merge & revert: more explanatory message please?
http://bitbucket.org/tortoisehg/stable/issue/447/merge-revert-more-explanatory-message
jbmohler on Wed, 29 Jul 2009 14:39:09 +0200:
Changes:
content: When viewing the file status dialog during a merge, my users become
confused because they do not understand the merge process. When clicking the
"revert" at the top of the dialog, they get the message "Revert file(s) to
local or other parent?" and don't know what to click. In reality, they should
be committing their merge, but they don't know that and this message does
nothing to clue them in.
By contrast, the mercurial command line reminds about the existence of a merge:
{{{
c:\builds\thing>hg revert y.txt
abort: uncommitted merge - please provide a specific revision
}}}
In fact, this was the way *I* finally realized what was going on in the gui
(and I think I know mercurial pretty well).
I suggest that the message be rewritten to explicitly mention the fact that you
are in the middle of a merge and suggest appropriate actions.
The deeper issue is that I worry that the merge process does not provide enough
guidance for novices. However, I definitely think that the new dialog in 0.8.1
is a real improvement in this regard. I may be overreacting as we have just
been bitten by mercurial bug http://mercurial.selenic.com/bts/issue1639 which
was blowing up our merge commits.
To reproduce this message, do the following:
{{{
hg init thing
cd thing
touch x.txt
hg addremove
hg commit -m "commit x"
touch y.txt
hg addremove
hg commit -m "commit y"
hg update -r 0
touch z.txt
hg addremove
hg commit -m "commit z"
# now, 2 heads
hg merge
# thg > view file status
# select revert, doesn't revert
}}}
I'm willing to rewrite that message and submit a patch, but I wanted a second
opinion first.
Thanks
Joel -> When viewing the file status dialog during a merge, my users become
confused because they do not understand the merge process. When clicking the
"revert" at the top of the dialog, they get the message "Revert file(s) to
local or other parent?" and don't know what to click. In reality, they should
be committing their merge, but they don't know that and this message does
nothing to clue them in.
By contrast, the mercurial command line reminds about the existence of a merge:
{{{
c:\builds\thing>hg revert y.txt
abort: uncommitted merge - please provide a specific revision
}}}
In fact, this was the way *I* finally realized what was going on in the gui
(and I think I know mercurial pretty well).
I suggest that the message be rewritten to explicitly mention the fact that you
are in the middle of a merge and suggest appropriate actions.
The deeper issue is that I worry that the merge process does not provide enough
guidance for novices. However, I definitely think that the new dialog in 0.8.1
is a real improvement in this regard. I may be overreacting as we have just
been bitten by mercurial bug http://mercurial.selenic.com/bts/issue1639 which
was blowing up our merge commits.
To reproduce this message, do the following:
{{{
hg init thing
cd thing
touch x.txt
hg addremove
hg commit -m "commit x"
touch y.txt
hg addremove
hg commit -m "commit y"
hg update -r 0
touch z.txt
hg addremove
hg commit -m "commit z"
# now, 2 heads
hg merge
# thg > view file status
# select revert, doesn't revert
}}}
I'm willing to rewrite that message and submit a patch, but I wanted a second
opinion first.
Thanks,
Joel
--
This is an issue notification from bitbucket.org.
You are receiving this either because you are the
owner of the issue, or you are following the issue.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
