Mercurial > hg
annotate tests/test-commit-copy.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 | ec5886db9dc6 |
children |
rev | line source |
---|---|
11803
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
1 $ hg init dir |
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
2 $ cd dir |
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
3 $ echo bleh > bar |
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
4 $ hg add bar |
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
5 $ hg ci -m 'add bar' |
3675
6990e499d71a
Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
6 |
11803
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
7 $ hg cp bar foo |
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
8 $ echo >> bar |
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
9 $ hg ci -m 'cp bar foo; change bar' |
3675
6990e499d71a
Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
11803
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
11 $ hg debugrename foo |
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
12 foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
11803
diff
changeset
|
13 $ hg debugindex bar |
11803
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
14 rev offset length base linkrev nodeid p1 p2 |
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
15 0 0 6 0 0 26d3ca0dfd18 000000000000 000000000000 |
b90199179eb5
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
3853
diff
changeset
|
16 1 6 7 1 1 d267bddd54f7 26d3ca0dfd18 000000000000 |