##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

add prechangegroup and pretxnchangegroup hooks....
add prechangegroup and pretxnchangegroup hooks. prechangegroup lets you stop push, pull or unbundle before it begins. pretxnchangegroup lets you inspect changegroup before transaction is committed, and roll back if you not like it.
Benoit Boissinot - - Load All Authors

File last commit:

r1581:db10b711 default
r1730:0f1d2c75 default
Show More
test-merge1.out
19 lines | 427 B | text/plain | TextLexer
/ tests / test-merge1.out
History | Annotation | Raw |Copy content |Copy permalink
%% no merges expected
%% merge should fail
abort: 'b' already exists in the working dir and differs from remote
%% merge of b expected
merging for b
merging b
%%
Contents of b should be "this is file b1"
This is file b1
%% merge fails
abort: outstanding uncommited changes
%% merge expected!
merging for b
merging b
%% merge of b should fail
abort: outstanding uncommited changes
%% merge of b expected
merging for b
merging b