annotate tests/test-default-push.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 6cc4b14fb76b
children 9910f60a37ee
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
1 $ hg init a
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
2
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
3 $ echo a > a/a
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
4 $ hg --cwd a ci -Ama
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
5 adding a
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
6
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
7 $ hg clone a c
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
8 updating to branch default
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
10
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
11 $ hg clone a b
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
12 updating to branch default
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
14
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
15 $ echo b >> b/a
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
16 $ hg --cwd b ci -mb
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
17
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
18 Push should push to 'default' when 'default-push' not set:
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
19
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
20 $ hg --cwd b push
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
21 pushing to $TESTTMP/a
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
22 searching for changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
23 adding changesets
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
24 adding manifests
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
25 adding file changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
26 added 1 changesets with 1 changes to 1 files
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
27
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
28 Push should push to 'default-push' when set:
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
29
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
30 $ echo 'default-push = ../c' >> b/.hg/hgrc
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
31 $ hg --cwd b push
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
32 pushing to $TESTTMP/c
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
33 searching for changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
34 adding changesets
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
35 adding manifests
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
36 adding file changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
37 added 1 changesets with 1 changes to 1 files
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
38