Mercurial > hg
annotate tests/test-push-hook-lock.t @ 14732:e9ed3506f066 stable
backout of d04ba50e104d: allow to qpop/push with a dirty working copy
The new behavior was breaking existing tools that relied on a sequence such as
this:
1) start with a dirty working copy
2) qimport some patch
3) try to qpush it
4) old behavior would fail at this point due to outstanding changes.
(new behavior would only fail if the outstanding changes and the patches
changes intersect)
5) innocent user qrefreshes, gets his local changes in the imported patch
It's worth considering if we can move this behavior to -f in the future.
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Fri, 24 Jun 2011 23:25:42 +0300 |
parents | 28e2e3804f2e |
children | 4e0b696a1cb3 |
rev | line source |
---|---|
12279 | 1 $ hg init 1 |
2 | |
3 $ echo '[ui]' >> 1/.hg/hgrc | |
4 $ echo 'timeout = 10' >> 1/.hg/hgrc | |
5 | |
6 $ echo foo > 1/foo | |
7 $ hg --cwd 1 ci -A -m foo | |
8 adding foo | |
9 | |
10 $ hg clone 1 2 | |
11 updating to branch default | |
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
13 | |
14 $ hg clone 2 3 | |
15 updating to branch default | |
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
17 | |
18 $ echo '[hooks]' >> 2/.hg/hgrc | |
19 $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc | |
20 | |
21 $ echo bar >> 3/foo | |
22 $ hg --cwd 3 ci -m bar | |
23 | |
24 $ hg --cwd 3 push ../2 | |
25 pushing to ../2 | |
26 searching for changes | |
27 adding changesets | |
28 adding manifests | |
29 adding file changes | |
30 added 1 changesets with 1 changes to 1 files | |
31 |