Mercurial > hg
annotate tests/test-rebuildstate.t @ 14485:610873cf064a
Make pull -u behave like pull && update
Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.
Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"
since it can no longer assume the user is running hg update.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 31 May 2011 11:52:22 -0700 |
parents | 8f258dd4ed02 |
children | 9ab2b3b730ee |
rev | line source |
---|---|
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
1 basic test for hg debugrebuildstate |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
2 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
3 $ hg init repo |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
4 $ cd repo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
6 $ touch foo bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
7 $ hg ci -Am 'add foo bar' |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
8 adding bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
9 adding foo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
11 $ touch baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
12 $ hg add baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
13 $ hg rm bar |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
14 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
15 $ hg debugrebuildstate |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
16 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
17 state dump after |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
18 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
19 $ hg debugstate --nodates | sort |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
20 n 666 -1 bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
21 n 666 -1 foo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
22 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
23 status |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
24 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
25 $ hg st -A |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
26 ! bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
27 ? baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
28 C foo |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
29 |