##// 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 | Source | Raw |Copy content |Copy permalink
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 %% no merges expected
Benoit Boissinot
abort when merging two heads and repository has local changes
 r1581 %% merge should fail
abort: 'b' already exists in the working dir and differs from remote
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 %% merge of b expected
mpm@selenic.com
[PATCH] Merging identical changes from another branch...
 r407 merging for b
merging b
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 %%
Contents of b should be "this is file b1"
mpm@selenic.com
Fix up test-merge1...
 r430 This is file b1
Benoit Boissinot
abort when merging two heads and repository has local changes
 r1581 %% merge fails
abort: outstanding uncommited changes
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 %% merge expected!
mpm@selenic.com
Fix up test-merge1...
 r430 merging for b
merging b
Benoit Boissinot
abort when merging two heads and repository has local changes
 r1581 %% merge of b should fail
abort: outstanding uncommited changes
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 %% merge of b expected
mpm@selenic.com
[PATCH] Merging identical changes from another branch...
 r407 merging for b
merging b