[Bug 3947] New: Graft should warn user when using

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=3947

          Priority: normal
            Bug ID: 3947
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: Graft should warn user when using
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: martin.janicek at oracle.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.6
         Component: transplant
           Product: Mercurial

Hi guys, we are using release/development repositories. Recently I have been
using graft for picking up certain high resistance change-set from the
development repository to the release one. Unfortunately I didn't know that
graft is working differently in comparison with transplant (merge X
diff-import) and used these commands:

hg graft rev_number
--> merge conflict shown, I resolved them locally
hg resolve conflicted_file
hg ci -m 'Grafting rev_number to the release branch'
hg fetch
hg out -pvM
--> results looks correctly because of -M
hg push

..obviously I used the graft in an incorrect way and as the result I partially
merged the development repository to our release repository which (as you can
imagine) was the most famous day of my work-life :)

I know this isn't bug in the true sense, but would it be possible to somehow
warn the user if a similar set of commands is used. I would say in such cases
it's almost certain that user don't want to merge anything.
And from my point of view the tool shouldn't let the developer to break the
repository with one command (speaking about hg ci after hg graft) without any
warning.

Or is there any hook I can use to avoid similar problems?

-- 
You are receiving this mail because:
You are on the CC list for the bug.